Merge Konflikt bereinigt

This commit is contained in:
2024-05-16 10:54:52 +02:00
92 changed files with 621 additions and 428 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,78 @@
//// This file contains orignal file paths Vs new file paths which would be used to reconcile the files when they are back to source
//// Der Pack-and-Go-Prozess wurde erfolgreich abgeschlossen. 69 Dokumente wurden in diesem Prozess kopiert.
//// Pack and Go Time: 2024/05/07 15:43:48
//// TopLevelAssembly: C:\DrawingFiles\00000000108_.asm:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\00000000108_.asm
//// Include Drafts:False
C:\DrawingFiles\00000000102.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\00000000102.par
C:\DrawingFiles\00000000107.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\00000000107.par
C:\DrawingFiles\00000000108_.asm:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\00000000108_.asm
C:\DrawingFiles\200000085.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\200000085.par
C:\DrawingFiles\200000087.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\200000087.par
C:\DrawingFiles\400102225.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102225.par
C:\DrawingFiles\400102226.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102226.par
C:\DrawingFiles\400102228.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102228.par
C:\DrawingFiles\400102229.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102229.par
C:\DrawingFiles\400102230.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102230.par
C:\DrawingFiles\400102313.psm:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102313.psm
C:\DrawingFiles\400102314.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102314.par
C:\DrawingFiles\400102315.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102315.par
C:\DrawingFiles\400102316.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102316.par
C:\DrawingFiles\400102318.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102318.par
C:\DrawingFiles\400102322.asm:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102322.asm
C:\DrawingFiles\400102325.asm:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102325.asm
C:\DrawingFiles\400102326.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102326.par
C:\DrawingFiles\400102352.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102352.par
C:\DrawingFiles\400102613.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102613.par
C:\DrawingFiles\400102632.asm:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102632.asm
C:\DrawingFiles\400102633.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102633.par
C:\DrawingFiles\400102634.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102634.par
C:\DrawingFiles\400102635.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102635.par
C:\DrawingFiles\400102648.asm:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102648.asm
C:\DrawingFiles\400102648_Gehaeuse.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102648_Gehaeuse.par
C:\DrawingFiles\400102648_Kolbenstange.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\400102648_Kolbenstange.par
C:\DrawingFiles\821114025.asm:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\821114025.asm
C:\DrawingFiles\821116004.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\821116004.par
C:\DrawingFiles\821116053.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\821116053.par
C:\DrawingFiles\822026004.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\822026004.par
C:\DrawingFiles\829416077.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\829416077.par
C:\DrawingFiles\829416079.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\829416079.par
C:\DrawingFiles\829416093.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\829416093.par
C:\DrawingFiles\829416105.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\829416105.par
C:\DrawingFiles\829436305.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\829436305.par
C:\DrawingFiles\829516001.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\829516001.par
C:\DrawingFiles\829516004.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\829516004.par
C:\DrawingFiles\829534130.asm:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\829534130.asm
C:\DrawingFiles\911021019.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911021019.par
C:\DrawingFiles\911021054.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911021054.par
C:\DrawingFiles\911021055.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911021055.par
C:\DrawingFiles\911021079.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911021079.par
C:\DrawingFiles\911021080.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911021080.par
C:\DrawingFiles\911021109.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911021109.par
C:\DrawingFiles\911021212.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911021212.par
C:\DrawingFiles\911021232.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911021232.par
C:\DrawingFiles\911051050.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911051050.par
C:\DrawingFiles\911081007.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911081007.par
C:\DrawingFiles\911091021.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911091021.par
C:\DrawingFiles\911091029.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911091029.par
C:\DrawingFiles\911091052.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911091052.par
C:\DrawingFiles\911091067.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911091067.par
C:\DrawingFiles\911261066.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\911261066.par
C:\DrawingFiles\912041004.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\912041004.par
C:\DrawingFiles\912041005.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\912041005.par
C:\DrawingFiles\913011009.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\913011009.par
C:\DrawingFiles\913011016.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\913011016.par
C:\DrawingFiles\913011140.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\913011140.par
C:\DrawingFiles\913011150.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\913011150.par
C:\DrawingFiles\914011006.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\914011006.par
C:\DrawingFiles\929012186.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\929012186.par
C:\DrawingFiles\929012539.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\929012539.par
C:\DrawingFiles\929012580.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\929012580.par
C:\DrawingFiles\929012603.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\929012603.par
C:\DrawingFiles\929012605.asm:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\929012605.asm
C:\DrawingFiles\929012605_Platte.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\929012605_Platte.par
C:\DrawingFiles\929012605_Schraube.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\929012605_Schraube.par
C:\DrawingFiles\929012606.par:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD\929012606.par
//// UniqueFolders
C:\DrawingFiles:?C:\Users\m.stangl\Documents\10-Develop\SSG-Ruledesigner-Konfigurator\CAD
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+543 -428
View File
File diff suppressed because it is too large Load Diff