From 057ad35e07649c92469346bf588f6d71d3f32a7f Mon Sep 17 00:00:00 2001
From: Vizzuality <contact@vizzuality.com>
Date: Mon, 23 May 2011 23:45:44 +0100
Subject: [PATCH] updated gitignore

---
 .gitignore | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e2c9f190..a1f5e3a6 100644
--- 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
\ No newline at end of file