intoduction of constant velocity for spring

[unres.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d0edd88..2086bde 100644 (file)
--- 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