X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=f973c199bc1118ee2c17e28c31718c36544cdc70;hp=88ebd96c1ae44b359a7b3db04a81ebea51212640;hpb=9349c57b49d842ee4925fa457aa52efc31de3587;p=unres.git

diff --git a/.gitignore b/.gitignore
index 88ebd96..2086bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,15 @@ cinfo.f
 # ignore build dir
 build/
 build2/
+<<<<<<< HEAD
+build_prere/
+period_build/
+period_build2/
+build_*/
+=======
+build_*/
+period_*/
+>>>>>>> master
 
 # latex files in documentation 
 doc/*/*.aux
@@ -30,3 +39,6 @@ compinfo
 period_build
 build_devel
 build_theta
+build_new
+build_prere/
+period_build2