Steps to reproduce
Either A. Open the 'raw' themes.tab that is available for download (http://bridgewater-brunel.me.uk/downloads/raw/simutrans/themes/themes.tab) on the Bridgewater-Brunel server at the time of posting.
Or B. Use the Nightly Updater on Windows and then open [Drive]:\simutrans\themes\themes.tab.
Expected behaviour
The file matches themes.tab in the master branch of jamespetts/simutrans-extended (https://github.com/jamespetts/simutrans-extended/blob/master/simutrans/themes/themes.tab).
Actual behaviour
The first line of the file of the 'raw'/Nightly Updater themes.tab is:
<<<<<<< HEAD
There is a Git merge marker in the middle:
# pak with the images for this theme
themeimages=newstandard.pak
=======
# Default simutrans theme
And the last line is:
>>>>>>> 0accae64d06b3867179915b6f2890c983b22ca99
Notes
My Linux client doesn't seem to care about this, perhaps because I am using a custom theme, but it triggered warnings in the Windows client logfile.
Also, the following setting is present in the file twice:
# pak with the images for this theme
themeimages=newstandard.pak
I changed themes.tab to match the master branch in a Windows installation and simu.log still reported Warning: simwin.cc themes_init(): Can't read themes from themes.tab, which I don't see in Linux logs. I don't know whether this warning has any bad consequences as the client crashed due to an unrelated issue.