ec0db0ed21
# Conflicts: # SicUI/Properties/AssemblyInfo.cs |
||
---|---|---|
.. | ||
UnitAlarmDefine | ||
DeviceModelSystem.xml | ||
IODefinePlatform.xml | ||
interlock.xml |
ec0db0ed21
# Conflicts: # SicUI/Properties/AssemblyInfo.cs |
||
---|---|---|
.. | ||
UnitAlarmDefine | ||
DeviceModelSystem.xml | ||
IODefinePlatform.xml | ||
interlock.xml |