Merge conflict in .gitignore

[wakeup.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5f70486..445006e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,11 @@
 Makefile.in
+aclocal.m4
+autom4te.cache
+compile
+config.h.in
+configure
+depcomp
+install-sh
+missing
+test-driver
 .*.swp