From: Brian Norris <banorris@uci.edu>
Date: Mon, 21 May 2012 04:20:17 +0000 (-0700)
Subject: .gitignore: fixup bad merge step
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d742590c334d40f63f08b42d6eb4ef9bb822103;p=cdsspec-compiler.git

.gitignore: fixup bad merge step

(You don't need both the *~ and *.*~ rules)
---

diff --git a/.gitignore b/.gitignore
index f9a2676..ab5a84a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,6 @@
 .*.swp
 *.so
 *~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
 
 # files in this directory
 /model