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

diff --git a/.gitignore b/.gitignore
index 4c3f4f2..b25ea14 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,19 @@
 *.swp
 *~
 
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
 
 # ignore build dir
 build/
+build2/
 
 # ignored dirs form adasko
 gradcheck/
 mapcheck/
 run/
 sympcheck/
-
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
+bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe
+bin/unres/MD-M/unres_Tc_procor_newparm_em64-D-symetr.exe
+DIL
+compinfo