Skip to content
Permalink
Browse files

Fix merge conflicts

  • Loading branch information
timlinux committed Jul 4, 2011
1 parent 963fec0 commit bb06a7f810e4966feda7d63c04014a51144ee159
Showing with 2 additions and 1 deletion.
  1. +2 −1 .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

0 comments on commit bb06a7f

Please sign in to comment.
You can’t perform that action at this time.