From 59f99895c30ffebafe713db0f8750c0499d1be4f Mon Sep 17 00:00:00 2001
From: Yuelin Wang <y.wang@schoenenberger.de>
Date: Mon, 21 Oct 2024 16:14:39 +0200
Subject: [PATCH]  C_ILS.xml Merge

---
 Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml b/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml
index 165762f..b92c08e 100644
--- a/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_ILS.xml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <palette><div class="paletteItem"><div><img id="s_Gefaellestrecke" class="shape" title="" family="Gefaellestrecke" shapeMode="0" src="SSG/shapes/img/Gefaellestrecke.png" /></div><div>Gefällestrecke Gerade</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_90_L_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_L_G_32px.png" /></div><div>90 Kurve links Gefällestrecke</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_90_R_G" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_90_R_G_32px.png" /></div><div>90 Kurve rechts Gefällestrecke</div></div>
@@ -12,7 +11,4 @@
 <div class="paletteItem"><div><img id="s_Kurve_60_R_F" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_60_R_F_32px.png" /></div><div>60 Kurve rechts angetriebene</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_30_L_F" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_L_F_32px.png" /></div><div>30 Kurve links angetriebene</div></div>
 <div class="paletteItem"><div><img id="s_Kurve_30_R_F" class="shape" title="" family="Kurve" shapeMode="0" src="SSG/shapes/img/Kurve_30_R_F_32px.png" /></div><div>30 Kurve rechts angetriebene</div></div>
-=======
-<palette><div class="paletteItem"><div><img id="s_Gefaellestrecke" class="shape" title="" family="Gefaellestrecke" shapeMode="0" src="SSG/shapes/img/Gefaellestrecke.png" /></div><div>Gefällestrecke</div></div>
->>>>>>> eb32d6964391e3d178d96a3caa1d762ad949bab0
 </palette>
\ No newline at end of file