projects / model-checker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 607a6be)
.gitignore: fixup bad merge step
authorBrian Norris <banorris@uci.edu>
Mon, 21 May 2012 04:20:17 +0000 (21:20 -0700)
committerBrian Norris <banorris@uci.edu>
Mon, 21 May 2012 04:20:17 +0000 (21:20 -0700)
(You don't need both the *~ and *.*~ rules)

.gitignore patch | blob | history

diff --git a/.gitignore b/.gitignore
index f9a26768ae7410a9403f3d87bec5d3829bcb0ab9..ab5a84ad8ea49a161901625cf3fd22202a3d5851 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,6 @@
 .*.swp
 *.so
 *~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
 
 # files in this directory
 /model
C++11 memory model checker