# Conflicts: # GenesisCordonelInterface/API/InterfaceGCIToLaatzen.cs # TBF/Rig/BridgeComponents/GciBridge/GciBridge.cs # TBF/TBF.csproj |
||
|---|---|---|
| .. | ||
| InterfaceGCIToLaatzen.cs | ||
| InterfaceOutsideToGCI.cs | ||
| ModelsMapping.cs | ||
| PublicModels.cs | ||
# Conflicts: # GenesisCordonelInterface/API/InterfaceGCIToLaatzen.cs # TBF/Rig/BridgeComponents/GciBridge/GciBridge.cs # TBF/TBF.csproj |
||
|---|---|---|
| .. | ||
| InterfaceGCIToLaatzen.cs | ||
| InterfaceOutsideToGCI.cs | ||
| ModelsMapping.cs | ||
| PublicModels.cs | ||