From 5d742590c334d40f63f08b42d6eb4ef9bb822103 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Sun, 20 May 2012 21:20:17 -0700
Subject: [PATCH] .gitignore: fixup bad merge step

(You don't need both the *~ and *.*~ rules)
---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

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
-- 
2.34.1