Fix merge conflicts

qgis · Jul 4, 2011 · bb06a7f · bb06a7f
1 parent 963fec0
commit bb06a7f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@ debian/*.substvars
 Makefile
 *-stamp
 api_doc
-build
+build*
 ms-windows/Installer-Files/postinstall.bat
 ms-windows/Installer-Files/preremove.bat
 ms-windows/osgeo4w/packages/
@@ -37,4 +37,5 @@ scripts/astyle.exe
 doc/CODING.html
 doc/CODING.tex
 doc/INSTALL.tex
+scripts/Debug
 scripts/RelWithDebInfo