Skip to content

K
kicad-source-mirror
Commit 58dcc12e authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Fix install.nsi conflict error

parent 2efd4b39
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
packaging/windows/nsis/install.nsi
View file @ 58dcc12e
...@@ -17,11 +17,7 @@ ...@@ -17,11 +17,7 @@
; General Product Description Definitions ; General Product Description Definitions
!define PRODUCT_NAME "KiCad" !define PRODUCT_NAME "KiCad"
<<<<<<< TREE
!define PRODUCT_VERSION "2011.01.07" !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 PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/" !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME "" !define COMPANY_NAME ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment