Merge conflict in .gitignore

diff --cc .gitignore
index fccb39b,5f70486..445006e
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,10 -1,2 +1,11 @@@
  Makefile.in
 +aclocal.m4
 +autom4te.cache
 +compile
 +config.h.in
 +configure
 +depcomp
 +install-sh
 +missing
 +test-driver
+ .*.swp