More merge misses

specklesystems · Oct 14, 2024 · cf8bae2 · cf8bae2
1 parent ab71daa
commit cf8bae2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 216 deletions.
diff --git a/packages/server/modules/activitystream/services/index.js b/packages/server/modules/activitystream/services/index.js
diff --git a/workspace.code-workspace b/workspace.code-workspace
@@ -90,12 +90,6 @@
     },
     "files.eol": "\n",
     "volar.vueserver.maxOldSpaceSize": 4000,
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "cSpell.words": ["Automations", "Bursty", "discoverability", "Insertable", "mjml"],
-=======
-=======
->>>>>>> main
     "cSpell.words": [
       "Automations",
       "Bursty",
@@ -105,10 +99,6 @@
       "mjml",
       "OIDC"
     ],
-<<<<<<< HEAD
->>>>>>> main
-=======
->>>>>>> main
     "tailwindCSS.experimental.configFile": {
       "packages/frontend-2/tailwind.config.mjs": "packages/frontend-2/**"
     },