Merge branch 'master' into multichain

[unres.git] / .gitignore

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