butcher butcher butcher

[gregoa/zavai.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 60f00cd99a232f36bcf3cd00288008e8064c9634..378eac25d311703f3f2cd456d8036da525cd0366 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1 @@
-<<<<<<< HEAD
-*.pyc
-*.swp
-*.o
-/src/*.c
-Makefile.in
-/Makefile
-/src/Makefile
-/src/*.stamp
-/aclocal.m4
-/autom4te.cache/
-/compile
-/config.guess
-/config.h
-/config.h.in
-/config.log
-/config.status
-/config.sub
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/m4/
-/missing
-/src/zavai
-/stamp-h1
-config.h.in~
-src/.deps/
-=======
 build
->>>>>>> .gitignore: build