Merge mmka.chem.univ.gda.pl:unres into adasko

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index abb3640..b25ea14 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # ignore compiled stuff
 *.[oa]
 
@@ -6,14 +5,19 @@
 *.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/
+
+# ignored dirs form adasko
 gradcheck/
 mapcheck/
 run/
 sympcheck/
->>>>>>> adasko
-
+bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe
+bin/unres/MD-M/unres_Tc_procor_newparm_em64-D-symetr.exe
+DIL
+compinfo