Resolved merge conflict by incorporating both suggestions.

2023-09-05 23:17:22 -07:00 · 2023-09-05 23:17:22 -07:00 · 7e13b2648b
parent 072503a808
commit 7e13b2648b
1 changed files with 4 additions and 0 deletions
--- a/4
+++ b/4
@ -1 +1,5 @@
+<<<<<<< HEAD
 projectfirewatch.com
+=======
+projectfirewatch.com
+>>>>>>> parent of 24f98f1 (Revert "Update CNAME")