X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=blobdiff_plain;f=.gitignore;h=2d9541f3d86e63d44e88331a60704a814ba5bc8a;hp=4c3f4f264ccb91d85ada8e01dbe24581ce985a01;hb=refs%2Fheads%2Fczarek;hpb=52187c9365594597457799445140ea830f1141a3

diff --git a/.gitignore b/.gitignore
index 4c3f4f2..2d9541f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,28 @@
-<<<<<<< HEAD
-*.[oa] 
-*~
-*.swp
-*.[eo][0-9][0-9][0-9][0-9]*
-=======
 # ignore compiled stuff
 *.[oa]
+cinfo.f
 
 # ignore texteditors
 *.swp
 *~
 
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
 
 # ignore build dir
 build/
+build2/
+
+# 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