Skip to content

Commit a9e9512

Browse files
committed
Fix conflict with PR #732
1 parent ee55d7a commit a9e9512

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ public override void Copy(MSTSWagon copy)
11611161
EmergencyEngagesHorn = locoCopy.EmergencyEngagesHorn;
11621162

11631163
WheelslipCausesThrottleDown = locoCopy.WheelslipCausesThrottleDown;
1164-
DriveWheelOnlyBrakes = locoCopy.DriveWheelOnlyBrakes;
1164+
11651165
CompressorIsMechanical = locoCopy.CompressorIsMechanical;
11661166
CompressorRestartPressurePSI = locoCopy.CompressorRestartPressurePSI;
11671167
TrainBrakePipeLeakPSIorInHgpS = locoCopy.TrainBrakePipeLeakPSIorInHgpS;
@@ -1171,7 +1171,7 @@ public override void Copy(MSTSWagon copy)
11711171
MainResVolumeM3 = locoCopy.MainResVolumeM3;
11721172
MainResChargingRatePSIpS = locoCopy.MainResChargingRatePSIpS;
11731173
BrakePipeDischargeTimeFactor = locoCopy.BrakePipeDischargeTimeFactor;
1174-
1174+
DriveWheelOnlyBrakes = locoCopy.DriveWheelOnlyBrakes;
11751175
DynamicBrakeBlended = locoCopy.DynamicBrakeBlended;
11761176
DynamicBrakeBlendingEnabled = locoCopy.DynamicBrakeBlendingEnabled;
11771177
DynamicBrakeAvailable = locoCopy.DynamicBrakeAvailable;

0 commit comments

Comments
 (0)