Merge in gitignore changes

git-svn-id: https://svn.shibboleth.net/cpp-xmltooling/branches/REL_1@865 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/.gitignore b/.gitignore
index e7dbe75..eabb10e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-
 # /
 /build
+/build-aux
 /Debug
 /*.ncb
 /*.suo
@@ -36,13 +36,10 @@
 /doc/Makefile
 /doc/Makefile.in
 
-<<<<<<< HEAD
 # /m4/
 /m4/libtool.m4
 /m4/lt*.m4
 
-=======
->>>>>>> https://issues.shibboleth.net/jira/browse/CPPXT-77
 # /schemas/
 /schemas/catalog.xml
 /schemas/Makefile
@@ -77,7 +74,3 @@
 
 # /xmltoolingtest/data/
 /xmltoolingtest/data/*.bak
-<<<<<<< HEAD
-/build-aux
-=======
->>>>>>> https://issues.shibboleth.net/jira/browse/CPPXT-77