resolved conflict and fixed issue hackforla#5618 "Westside"

kevin31yu · Oct 20, 2023 · be9fec5 · be9fec5
1 parent aaffb24
commit be9fec5
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/cspell.json b/cspell.json
@@ -3,13 +3,9 @@
   "language": "en",
   // words - list of words to be always considered correct
   "words": [
-<<<<<<< HEAD
     "Westside",
+    "Cleantech",
     "collabathon"
-=======
-      "Cleantech",
-      "collabathon"
->>>>>>> a48667b52f64460319008118cc10983e64212252
   ],
   "ignorePaths": [
     "node_modules",