X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=4a3d4a16fc1c0c5c973b9ca6ada3c4b0a2152651;hp=442c6c4d1ed2f52626f36b85b67d388b08aa703b;hpb=850bc1577aa5a139a2bc5512cb29b1eb1c0e9b99;p=unres.git

diff --git a/.gitignore b/.gitignore
index 442c6c4..2086bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,16 @@ cinfo.f
 # ignore build dir
 build/
 build2/
+<<<<<<< HEAD
+build_prere/
+period_build/
+period_build2/
+build_*/
+=======
 build_*/
 period_*/
+>>>>>>> master
+
 # latex files in documentation 
 doc/*/*.aux
 doc/*/*.log
@@ -28,3 +36,9 @@ bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe
 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