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

diff --git a/.gitignore b/.gitignore
index 4c3f4f2..8b33225 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,14 +5,22 @@
 *.swp
 *~
 
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
 
 # ignore build dir
 build/
 
+# latex files in documentation 
+doc/*/*.aux
+doc/*/*.log
+
+
 # ignored dirs form adasko
 gradcheck/
 mapcheck/
 run/
 sympcheck/
-
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
+compinfo
+DIL/
+bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe