Resolve merge conflict markers in projects.json

2026-07-16 07:41:02 +00:00 · 2026-03-05 21:53:33 -05:00
parent a4dc7b3a35
commit 61ca34d908
1 changed files with 1 additions and 5 deletions
--- a/projects.json
+++ b/projects.json
@@ -21,8 +21,4 @@
      "priority": 4
    }
  ]
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> d87156cc708ff871f6e05ec29401201e19601016
+}