From 61ca34d908fe486efb6c3fe1719f3cd405f769fb Mon Sep 17 00:00:00 2001
From: "Andrew P. Harper" <115321970+KoopaCode@users.noreply.github.com>
Date: Thu, 5 Mar 2026 21:53:33 -0500
Subject: [PATCH] Resolve merge conflict markers in projects.json

---
 projects.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/projects.json b/projects.json
index bf1c0c1..2e40d37 100644
--- a/projects.json
+++ b/projects.json
@@ -21,8 +21,4 @@
       "priority": 4
     }
   ]
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> d87156cc708ff871f6e05ec29401201e19601016
+}
\ No newline at end of file