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

Merge conflikt gelöst

Browse Source
This commit is contained in:
Paul Wolok
2025-09-19 15:17:10 +02:00
parent 8045ffaaa7
commit ea678d7a23
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MAIN_SSG.rdx
+1 -4
View File
@@ -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">