FIXED Conflict Resolution Troubles

Jose Casasola · Jose Casasola · commit 6d623981d64c · 2015-10-02T11:34:01.000-07:00
diff --git a/conflict.txt b/conflict.txt
@@ -1,3 +1,4 @@
 git is very useful.
 
 please keep your line here:
+git ia not better than me at conflict resolution.

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`git is very useful.`
`2`	`2`
`3`	`3`	`please keep your line here:`
	`4`	`+git ia not better than me at conflict resolution.`