Fix install.nsi conflict error

58dcc12e · jean-pierre charras · 2efd4b39 · 58dcc12e
Commit 58dcc12e authored Jan 08, 2011 by jean-pierre charras
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

install.nsi packaging/windows/nsis/install.nsi +0 -4

No files found.
--- a/packaging/windows/nsis/install.nsi
+++ b/packaging/windows/nsis/install.nsi
@@ -17,11 +17,7 @@

 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-<<<<<<< TREE
 !define PRODUCT_VERSION "2011.01.07"
-=======
-!define PRODUCT_VERSION "2010.12.22"
->>>>>>> MERGE-SOURCE
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""