Drop invalid ignore line from previous merge.

digabi · Feb 9, 2015 · 35633e1 · 35633e1
1 parent a372bbd
commit 35633e1
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 *~
-<<<<<<< HEAD
 /.build/
 /binary/
 /cache/