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

Korrektur des letzten Merges

Browse Source
This commit is contained in:
Simon Schmutzler
2024-06-10 14:05:13 +02:00
parent 18e644487b
commit 749e4c0724
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MAIN_SSG.rdx
-4
View File
@@ -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">