From 7e13b2648b3d809ade8e96a1294b976d57169c54 Mon Sep 17 00:00:00 2001
From: Sophia Atkinson <sophialul@protonmail.com>
Date: Tue, 5 Sep 2023 23:17:22 -0700
Subject: [PATCH] Resolved merge conflict by incorporating both suggestions.

---
 CNAME | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CNAME b/CNAME
index b53ae35..d6b9bda 100644
--- a/CNAME
+++ b/CNAME
@@ -1 +1,5 @@
+<<<<<<< HEAD
 projectfirewatch.com
+=======
+projectfirewatch.com
+>>>>>>> parent of 24f98f1 (Revert "Update CNAME")