resolving merge conflicts

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4c3f4f2..d5a15a6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-*.[oa] 
-*~
-*.swp
-*.[eo][0-9][0-9][0-9][0-9]*
-=======
 # ignore compiled stuff
 *.[oa]
 
@@ -11,6 +5,8 @@
 *.swp
 *~
 
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
 
 # ignore build dir
 build/
@@ -21,4 +17,3 @@ mapcheck/
 run/
 sympcheck/
 
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1