mirror of https://github.com/OpenRCT2/OpenRCT2.git
remove git merge seperator
This commit is contained in:
parent
40a885f2c4
commit
15f6f9b66a
|
@ -3899,7 +3899,6 @@ STR_5557 :Stay connected after desynchronisation (Multiplayer)
|
|||
STR_5558 :A restart is required for this setting to take effect
|
||||
STR_5559 :10 min. inspections
|
||||
STR_5560 :{SMALLFONT}{BLACK}Sets the inspection time to 'Every 10 minutes' on all rides
|
||||
<<<<<<< HEAD
|
||||
STR_5561 :Failed to load language file
|
||||
STR_5562 :WARNING!
|
||||
STR_5563 :This feature is currently unstable, take extra caution.
|
||||
|
|
Loading…
Reference in New Issue