From 58dcc12ebb79e01b3b827e761915bb12c59c0687 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 8 Jan 2011 20:08:13 +0100 Subject: [PATCH] Fix install.nsi conflict error --- packaging/windows/nsis/install.nsi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi index 5ddb62e5be..ef7c5cb772 100644 --- 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 ""