From 749e4c07241b30d75c35441a57425cb0a607066d Mon Sep 17 00:00:00 2001
From: Simon Schmutzler <s.schmutzler@schoenenberger.de>
Date: Mon, 10 Jun 2024 14:05:13 +0200
Subject: [PATCH] Korrektur des letzten Merges

---
 MAIN_SSG.rdx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index cb974bc..6c9aa9e 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-<<<<<<< HEAD
 	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-10T12:33:13" LanguageVersion="2014.1.3.673" />
-=======
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="dre [NBDELP3561-04C]" ModDate="2024-06-10T11:25:19" LanguageVersion="2014.1.3.674" />
->>>>>>> 520101739a126423e5d3ce5c376e8d293a3f2205
 	<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
 		<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
 			<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">