mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Fix rebase mistakes

Browse Source
This commit is contained in:
duncanspumpkin
2021-03-27 09:20:29 +00:00
committed by Ted John
parent efbc1453e2
commit 07eee1cdf9
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2/localisation/StringIds.h
View File

@@ -3900,7 +3900,6 @@ enum
STR_INSTALL_INNOEXTRACT = 6408,
STR_NOT_THE_GOG_INSTALLER = 6409,
<<<<<<< HEAD
STR_ZOOM_BUTTON_ON_TOOLBAR = 6410,
STR_ZOOM_BUTTON_ON_TOOLBAR_TIP = 6411,