X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=a5f7d9f55e6e0f07be66dce4c30740db41b6461e;hp=77a69e0ad3b9fa22f55f7f0d78f104fcbc845d56;hpb=2ec03757b68a8fb1a604a7f84f83086291fc75db;p=unres.git

diff --git a/.gitignore b/.gitignore
index 77a69e0..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
@@ -28,3 +37,8 @@ bin/unres/MD-M/unres_Tc_procor_newparm_em64-D-symetr.exe
 DIL/
 compinfo
 period_build
+build_devel
+build_theta
+build_new
+build_prere/
+period_build2