merge konflikt bereinigt

bin/setenv.bat

@@ -1,6 +1,8 @@
 @echo off
+REM falls Umlaute in den Pfaden sind:
+chcp 65001 > nul
 
-set PROJECT=c:\Kabellaengen
+set PROJECT=c:\10-Develop\gitrepos\Kabellaengen
 set PROJECT_BIN=%PROJECT%\bin
 set PROJECT_CFG=%PROJECT%\cfg
 set PROJECT_DOC=%PROJECT%\doc
@@ -15,8 +17,8 @@ set SIVAS_EXCEL_EXPORT_DIR=%PROJECT_DATA%
 if not exist %PROJECT%\work mkdir %PROJECT%\work
 if not exist %PROJECT%\data mkdir %PROJECT%\data
 
-set PROJECT_IO_RESULTS=Z:\Automatisierung\Konvertierungstools\4_io-Konvertierer
-set PROJECT_BOM_RESULTS=Z:\Automatisierung\Konvertierungstools\3_Kabellaengen-Konvertierer
+set PROJECT_IO_RESULTS=%PROJECT_WORK%
+set PROJECT_BOM_RESULTS=%PROJECT_WORK%
 set INSTALL_DIR="%ONEDRIVE%\Desktop\Kabeltool"
 
 set PATH=%PROJECT_BIN%;%PATH%
@@ -24,6 +26,3 @@ set PATH=%PROJECT_BIN%;%PATH%
 
 popd
 goto :eof
-
-
-