this should/will create a conflict!?

bgraw3 · Apr 5, 2011 · beaadfe · beaadfe
1 parent 356a1c5
commit beaadfe
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/another.txt b/another.txt
@@ -1,3 +1,5 @@
 another file.txt
 want to see what happens.
 have not merged anything, yet.
+
+conflict?