Schoenenberger_Systeme_GmbH/SSG-Ruledesigner-Konfigurator
3
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Fehlerhafter Merge repariert

Browse Source
This commit is contained in:
Simon Hensch
2025-10-23 07:58:59 +02:00
parent 23ffe308cf
commit 30e1895541
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MAIN_SSG.rdx
+1 -5
View File
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True"> <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" /> <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:0002" Name="Declarations" SubType="Declarations" Expanded="True">
<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0"> <GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0"> <GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -64725,4 +64721,4 @@ me.x
</PROFILES_DATA> </PROFILES_DATA>
<BOM_DATA /> <BOM_DATA />
</EXTERNAL_DATA> </EXTERNAL_DATA>
</PROCESS> </PROCESS>