fixed merge conflicts

thegarage · Sep 19, 2014 · 82ac90d · 82ac90d
2 parents 399c838 + b112477
commit 82ac90d
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/bin/bad.txt b/bin/bad.txt
@@ -1,2 +1 @@
-bar
-
+foo