From 9ad0c9ca8e3cbeb67ffdbcc1e461821010d2d074 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Thu, 5 Jun 2025 16:44:14 +0200
Subject: [PATCH] fix in bat

---
 bin/install.bat | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bin/install.bat b/bin/install.bat
index 2e7f1f0..d64c0dc 100644
--- a/bin/install.bat
+++ b/bin/install.bat
@@ -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