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

diff --git a/.gitignore b/.gitignore
index 4c3f4f2..521532d 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,9 +5,12 @@
 *.swp
 *~
 
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
 
 # ignore build dir
 build/
+source/ga/build
 
 # ignored dirs form adasko
 gradcheck/
@@ -21,4 +18,3 @@ mapcheck/
 run/
 sympcheck/
 
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1