# Conflicts: # src/settings.cpp # src/settings_gui.cpp # src/settings_internal.h # src/table/currency_settings.ini # src/table/gameopt_settings.ini # src/table/misc_settings.ini # src/table/settings.h.preamble
fb0403dc