Conflict edited. Git is better

Daniel Moreno · Daniel Moreno · commit 9977a5b1b8b6 · 2015-10-02T09:45:30.000-07:00
diff --git a/conflict.txt b/conflict.txt
@@ -1,3 +1,3 @@
-git is good at conflict resolution.
+git is better now at conflict resolution.
 
 please keep your line here:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-git is good at conflict resolution.`
	`1`	`+git is better now at conflict resolution.`
`2`	`2`
`3`	`3`	`please keep your line here:`