Commit 701cb27
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.1 file changed
+2
-2
lines changedLines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3473 | 3473 | | |
3474 | 3474 | | |
3475 | 3475 | | |
3476 | | - | |
| 3476 | + | |
3477 | 3477 | | |
3478 | 3478 | | |
3479 | 3479 | | |
3480 | | - | |
| 3480 | + | |
3481 | 3481 | | |
3482 | 3482 | | |
3483 | 3483 | | |
| |||
0 commit comments