X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=c0b1de623df135e16e40d0be896dc5d9df8faf2f;hb=f57658c1e8a49c4fcef754af796bf7a2ae9f28e2;hp=4c3f4f264ccb91d85ada8e01dbe24581ce985a01;hpb=3a261ae36be53eb4fadc9f30179cebb122b5b280;p=unres.git

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