updated gitignore

Vizzuality · May 23, 2011 · 057ad35 · 057ad35
1 parent e415ca4
commit 057ad35
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,8 +11,7 @@ graphs/
 graphs
 nginx.conf
 scripts/output.log
-<<<<<<< HEAD
-=======
 tile_data.sh
 vector_data.sh
->>>>>>> 0aa519d65b82a057f85f51170cc07f7358ed6f33
+app.sh
+all.sh