Skip to content

Commit 701cb27

Browse files
committed
Merge branch 'help-add-train-info-tab' of https://github.com/rwf-rr/rwf-openrails into help-add-train-info-tab
Manually fixed conflict in Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs. I should have pulled help-add-train-info-tab from origin first (as it had a merge fix from someone else), instead if trying to fix it in the merge from master.
2 parents cc5379f + cb510d6 commit 701cb27

File tree

1 file changed

+2
-2
lines changed
  • Source/Orts.Simulation/Simulation/RollingStocks

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3473,11 +3473,11 @@ public LatLonDirection GetLatLonDirection()
34733473

34743474
return new LatLonDirection(latLon, directionDeg); ;
34753475
}
3476-
3476+
34773477
public int GetWagonNumAxles() { return WagonNumAxles; }
34783478

34793479
public float GetGravitationalAccelerationMpS2() { return GravitationalAccelerationMpS2; }
3480-
3480+
34813481
/// <summary>
34823482
/// Update the gravity force and % gradient of this train car at the current position
34833483
/// </summary>

0 commit comments

Comments
 (0)