Skip to content

Commit 26f569b

Browse files
committed
Bypass merge conflict
1 parent 9ca77b6 commit 26f569b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Common/Events.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public enum Event
3131
AITrainHelperLoco,
3232
AITrainLeadLoco,
3333
AITrainLeavingStation,
34+
PlayerTrainHelperLoco,
35+
PlayerTrainLeadLoco,
3436
BatterySwitchOff,
3537
BatterySwitchOn,
3638
BatterySwitchCommandOff,
@@ -127,8 +129,6 @@ public enum Event
127129
PermissionDenied,
128130
PermissionGranted,
129131
PermissionToDepart,
130-
PlayerTrainHelperLoco,
131-
PlayerTrainLeadLoco,
132132
PowerKeyOff,
133133
PowerKeyOn,
134134
ReverserChange,

0 commit comments

Comments
 (0)