X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=25485f355e5b4958e76f139ed2f07f1dad4b1c23;hb=b64f5db586b97d6f52b422a0edbcbcdadb0400fe;hp=4c3f4f264ccb91d85ada8e01dbe24581ce985a01;hpb=52187c9365594597457799445140ea830f1141a3;p=unres.git

diff --git a/.gitignore b/.gitignore
index 4c3f4f2..25485f3 100644
--- 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/
@@ -20,5 +16,4 @@ gradcheck/
 mapcheck/
 run/
 sympcheck/
-
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
+compinfo