Merge branch 'master' into multichain

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0604082..2086bde 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +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 +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