From 30e189554154304169d06932c547e94e46b79da8 Mon Sep 17 00:00:00 2001
From: Simon Hensch <s.hensch@schoenenberger.de>
Date: Thu, 23 Oct 2025 07:58:59 +0200
Subject: [PATCH] Fehlerhafter Merge repariert

---
 MAIN_SSG.rdx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 54ebdc7..9bb755c 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">
-<<<<<<< Updated upstream
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-10-22T16:42:27" LanguageVersion="2014.1.3.712" />
-=======
 	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.hensch [ANGEBOT-NB06]" ModDate="2025-10-22T16:40:32" LanguageVersion="2014.1.3.712" />
->>>>>>> Stashed changes
 	<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">
@@ -64725,4 +64721,4 @@ me.x
 		</PROFILES_DATA>
 		<BOM_DATA />
 	</EXTERNAL_DATA>
-</PROCESS>
\ No newline at end of file
+</PROCESS>