confilict is fixed

MohamadAminChahardoli · Jul 23, 2018 · 0776907 · 0776907
2 parents 14113d6 + f939c56
commit 0776907
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+# LearningGit
+This project is just a test fo learning how to use git in projects.
diff --git a/text_file2.txt b/text_file2.txt
@@ -1,2 +1,4 @@
-i am a text file.
-lets learn github
+Hi, i am a text file
+lets learn github
+
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# LearningGit
		This project is just a test fo learning how to use git in projects.