Finish merge of build.bat

Author: martinweismann

Build/build.bat

@@ -4,39 +4,22 @@ set basepath="%~dp0"
 
 cd %basepath%\..\Source
 set Sources=actutils.go automaticcomponenttoolkit.go buildbindingccpp.go buildbindingccppdocumentation.go buildbindingcsharp.go buildbindinggo.go buildbindingnode.go buildbindingpascal.go buildbindingpython.go buildimplementationcpp.go buildbindingjava.go buildimplementationpascal.go componentdefinition.go componentdiff.go languagewriter.go languagec.go languagecpp.go languagepascal.go
-<<<<<<< HEAD
 
 set GOOS=windows
 set GOARCH=amd64
 echo "Build act.win64.exe"
 go build -o ..\act.win64.exe %Sources%
 
 echo "Patching properties of act.win64.exe"
-..\build\verpatch ..\act.win64.exe /high /va 1.7.0 /pv "1.7.0-develop" /s copyright "(c) 2018-2019 ACT Developers" /s desc "ACT is a code generator for software components" /s productName "Automatic Component Toolkit"
+..\build\verpatch ..\act.win64.exe /high /va 1.8.0 /pv "1.8.0-develop" /s copyright "(c) 2018-2019 ACT Developers" /s desc "ACT is a code generator for software components" /s productName "Automatic Component Toolkit"
 
 set GOOS=windows
-=======
-
-set GOOS=windows
-set GOARCH=amd64
-echo "Build act.exe"
-go build -o ..\act.win64.exe %Sources%
-
-echo "Patching properties of act.win64.exe"
-..\build\verpatch ..\act.win64.exe /high /va 1.7.0 /pv "1.7.0-develop" /s copyright "(c) 2018-2019 ACT Developers" /s desc "ACT is a code generator for software components" /s productName "Automatic Component Toolkit"
-
-set GOOS=windows
->>>>>>> ADSK/develop
 set GOARCH=386
 echo "Build act.win32.exe"
 go build -o ..\act.win32.exe %Sources%
 
-<<<<<<< HEAD
 echo "Patching properties of act.win32.exe"
-=======
-echo "Patching properties of act_win32.exe"
->>>>>>> ADSK/develop
-..\build\verpatch ..\act.win32.exe /high /va 1.7.0 /pv "1.7.0-develop" /s copyright "(c) 2018-2019 ACT Developers" /s desc "ACT is a code generator for software components" /s productName "Automatic Component Toolkit"
+..\build\verpatch ..\act.win32.exe /high /va 1.8.0 /pv "1.8.0-develop" /s copyright "(c) 2018-2019 ACT Developers" /s desc "ACT is a code generator for software components" /s productName "Automatic Component Toolkit"
 
 set GOOS=linux
 set GOARCH=amd64