mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix merge error in englush_uk.txt
This commit is contained in:
parent
b04ba50400
commit
f7dd9859e4
|
@ -3791,7 +3791,6 @@ STR_5454 :Uncap FPS
|
||||||
STR_5455 :Enable sandbox mode
|
STR_5455 :Enable sandbox mode
|
||||||
STR_5456 :Disable clearance checks
|
STR_5456 :Disable clearance checks
|
||||||
STR_5457 :Disable support limits
|
STR_5457 :Disable support limits
|
||||||
<<<<<<< HEAD
|
|
||||||
STR_5458 :Rotate clockwise
|
STR_5458 :Rotate clockwise
|
||||||
STR_5459 :Rotate anti-clockwise
|
STR_5459 :Rotate anti-clockwise
|
||||||
STR_5460 :Rotate view anti-clockwise
|
STR_5460 :Rotate view anti-clockwise
|
||||||
|
@ -3801,5 +3800,3 @@ STR_5463 :Goal: Have fun!
|
||||||
STR_5464 :General
|
STR_5464 :General
|
||||||
STR_5465 :Climate
|
STR_5465 :Climate
|
||||||
STR_5466 :Staff
|
STR_5466 :Staff
|
||||||
=======
|
|
||||||
>>>>>>> allow disable clearance checks for footpaths
|
|
||||||
|
|
Loading…
Reference in New Issue