From ea678d7a23e087b5ceb276928d1d17b790c5011e Mon Sep 17 00:00:00 2001
From: Paul Wolok <p.wolok@schoenenberger.de>
Date: Fri, 19 Sep 2025 15:17:10 +0200
Subject: [PATCH] =?UTF-8?q?Merge=20conflikt=20gel=C3=B6st?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 3b2e6bd..34ab1f1 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,10 +1,7 @@
 <?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="y.wang [ANGEBOT-NB02]" ModDate="2025-09-19T13:34:33" LanguageVersion="2014.1.3.698" />
-=======
 	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="p.wolok [AZUBI-NB10]" ModDate="2025-09-19T10:21:37" LanguageVersion="2014.1.3.712" />
->>>>>>> 9692ac9efd1fa0499d75add796c129c5572208e6
+
 	<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">