mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1609 from Gymnasiast/patch-3 

Fix merge error in english_uk.txt
This commit is contained in:
Ted John 2015-07-14 11:16:32 +01:00
parent b04ba50400 f7dd9859e4
commit 9e52e93140
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/language/english_uk.txt
View File

@ -3791,7 +3791,6 @@ STR_5454 :Uncap FPS
STR_5455 :Enable sandbox mode
STR_5456 :Disable clearance checks
STR_5457 :Disable support limits
<<<<<<< HEAD
STR_5458 :Rotate clockwise
STR_5459 :Rotate anti-clockwise
STR_5460 :Rotate view anti-clockwise
@ -3801,5 +3800,3 @@ STR_5463 :Goal: Have fun!
STR_5464 :General
STR_5465 :Climate
STR_5466 :Staff
=======
>>>>>>> allow disable clearance checks for footpaths