# Conflicts: # src/company_cmd.cpp # src/console_cmds.cpp # src/linkgraph/linkgraph_gui.cpp # src/screenshot.cpp # src/settings_gui.cp
# Conflicts: # src/company_cmd.cpp # src/console_cmds.cpp # src/linkgraph/linkgraph_gui.cpp # src/screenshot.cpp # src/settings_gui.cp