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

fix merge error

Browse Source
This commit is contained in:
IntelOrca
2014-08-21 22:54:27 +01:00
parent e9fab52db2
commit 306ff79bc7
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/language.c
View File

@@ -42,12 +42,8 @@ const char *language_filenames[LANGUAGE_COUNT] = {
"dutch", // LANGUAGE_DUTCH
"french", // LANGUAGE_FRENCH
"hungarian", // LANGUAGE_HUNGARIAN
<<<<<<< HEAD
"polish", // LANGUAGE_POLISH
"spanish_sp" // LANGUAGE_SPANISH
=======
"polish" // LANGUAGE_POLISH
>>>>>>> new-ride-window
};
int gCurrentLanguage = LANGUAGE_UNDEFINED;