fix in bat

2025-06-05 16:44:14 +02:00
parent ef329c0a9a
commit 9ad0c9ca8e
1 changed files with 0 additions and 5 deletions
@@ -3,12 +3,7 @@
 set TARGETDIR="%USERPROFILE%\Desktop\Kabeltool"
 mkdir %TARGETDIR%
 set SHORTCUT=%TARGETDIR%\create_cables.lnk
-
-<<<<<<< HEAD
-set CHECKOUT_DIR="C:\10-Develop\kabellaengen"
-=======
 set CHECKOUT_DIR="C:\kabellaengen"
->>>>>>> a0e7fdfa5b89d82c67808b94a3b5ad35dc5fa035

 set TARGET=%CHECKOUT_DIR%\bin\run.bat
 set ICON=%CHECKOUT_DIR%\doc\img\Icons\Icon_Gemini2.ico