X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=.gitignore;h=5e03956ed5e4b5e72e434521de7c71407a084009;hb=7396a5a6ab2d85ff06194048cf441e5ca99899d9;hp=4c3f4f264ccb91d85ada8e01dbe24581ce985a01;hpb=446f12ef8de6a998373ee9aa62f136e0933bf1b5;p=unres.git

diff --git a/.gitignore b/.gitignore
index 4c3f4f2..5e03956 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,6 @@ gradcheck/
 mapcheck/
 run/
 sympcheck/
-
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
+compinfo
+DIL/
+bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe