# Conflicts: # .github/workflows/release-macos.yml # src/company_gui.cpp # src/linkgraph/linkgraph.cpp # src/newgrf_debug_gui.cpp # src/strgen/strgen_base.cpp # src/timetable_gui.cpp
# Conflicts: # .github/workflows/release-macos.yml # src/company_gui.cpp # src/linkgraph/linkgraph.cpp # src/newgrf_debug_gui.cpp # src/strgen/strgen_base.cpp # src/timetable_gui.cpp