[gifsicle/el6] Cleanup .gitignore and sources

[Orion Poplawski]

commit b7b1a006948ba6c73cbb57a58d4abcca056df7c9
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Feb 4 10:33:59 2013 -0700

    Cleanup .gitignore and sources

 .gitignore |    3 ---
 sources    |    4 ----
 2 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8f20b7..c4032fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 gifsicle-1.60.tar.gz
-<<<<<<< HEAD
-=======
 /gifsicle-1.61.tar.gz
 /gifsicle-1.62.tar.gz
 /gifsicle-1.63.tar.gz
@@ -9,4 +7,3 @@ gifsicle-1.60.tar.gz
 /gifsicle-1.67.tar.gz
 /gifsicle-1.68.tar.gz
 /gifsicle-1.70.tar.gz
->>>>>>> master
diff --git a/sources b/sources
index 1ba3027..cded602 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-2629d5894e189e251f148eec8e7805d6  gifsicle-1.60.tar.gz
-=======
 b48eb454fcd03d1a1c726443e430b90b  gifsicle-1.70.tar.gz
->>>>>>> master