X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=f973c199bc1118ee2c17e28c31718c36544cdc70;hp=408ced99d16ebff63ef55d32c0a19788e176780a;hpb=94763f6dd92c61677ab8918c9caf9f9ffd608112;p=unres.git

diff --git a/.gitignore b/.gitignore
index 408ced9..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
@@ -29,3 +38,7 @@ DIL/
 compinfo
 period_build
 build_devel
+build_theta
+build_new
+build_prere/
+period_build2