mirror of
https://github.com/ProjectFirewatch/ProjectFirewatch.git
synced 2024-06-01 11:35:11 -07:00
Resolved merge conflict by incorporating both suggestions.
This commit is contained in:
parent
072503a808
commit
7e13b2648b