Merge branch 'main' into hey_new_branch

simeon-demo · Aug 23, 2024 · 3d000c3 · 3d000c3
2 parents e753054 + 9b62a0a
commit 3d000c3
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 3 deletions.
diff --git a/IM_playground/myfile2.txt b/IM_playground/myfile2.txt
@@ -0,0 +1,3 @@
+That's a new file in the new folder for the joint project
+
+attempt 2
diff --git a/README.md b/README.md
@@ -1,16 +1,33 @@
 # dsi_c4_playground
 
+Hello fellow human! This is a virtual playground for trying out git so that you don't lose any sleep tonight.
+
+Remember: Once you're a master of Git, cha-ching!
+
+aweofijaweofijaweiof
+asdlkjfalweij
+
+---
+
 Hello team! this is a test.
 
+
+Hello, this is also a test.
+
+testing 123
+=======
+aweofiajweofijaweoifj
+
 Hello, this is also a test.
 
 hello :)
 
-Not sure if this is working. LOL. From Carlos GD
+Test. From Simeon.
 
 edited from JP
 
 Hello everyone - Toronto 
 
-
 hi can you see my change
+
+This is Namreen
diff --git a/cinema.txt b/cinema.txt
@@ -0,0 +1,2 @@
+Hey! 
+It's Shayan, and it's just a random text file :)
diff --git a/hosein.txt b/hosein.txt
@@ -0,0 +1 @@
+hello 
diff --git a/myfile.txt b/myfile.txt
@@ -7,4 +7,13 @@ It is a long established fact that a reader will be distracted by the readable c
 Where does it come from?
 Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.
 
+
+What is the answer to life, the universe, everything?
+=======
 Hello, I wanted to add a comment here.
+
+hello
+
+test test test
+
+
diff --git a/nk b/nk
@@ -0,0 +1 @@
+Hello nk!
diff --git a/uoft-studying.png b/uoft-studying.png
diff --git a/yourfile.txt b/yourfile.txt
@@ -1 +1,11 @@
-# `Hello`
+
+something something but in latin  
+
+sjl is making the changes
+
+Testbranch
+Test for testbranch
+# `Hello`
+
+# Marcio was here!
+ main
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		That's a new file in the new folder for the joint project

		attempt 2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Hey!
		It's Shayan, and it's just a random text file :)