# ignore build dir
build/
build2/
+<<<<<<< HEAD
+build_prere/
+period_build/
+period_build2/
+build_*/
+=======
+build_*/
+period_*/
+>>>>>>> master
# latex files in documentation
doc/*/*.aux
compinfo
period_build
build_devel
+build_theta
+build_new
+build_prere/
+period_build2