rm exe

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index abb3640..2d9541f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,28 @@
-<<<<<<< HEAD
 # ignore compiled stuff
 *.[oa]
+cinfo.f
 
 # ignore texteditors
 *.swp
 *~
 
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
 
-# ifnore build dir
+# ignore build dir
 build/
-=======
-~.[ao]
+build2/
+
+# latex files in documentation 
+doc/*/*.aux
+doc/*/*.log
+
+
+# ignored dirs form adasko
 gradcheck/
 mapcheck/
 run/
 sympcheck/
->>>>>>> adasko
-
+compinfo
+DIL/
+bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe