# Conflicts: # .github/workflows/ci-emscripten.yml # cmake/scripts/FindVersion.cmake # src/main_gui.cpp # src/road_gui.cpp # src/settings_type.h # src/smallmap_gui.cpp # src/table/sprites.h # src/table/station_land.h # src/viewport_gui.cpp # src/widgets/smallmap_widget.h
69d5b9d3