switch planx-core ref

theopensystemslab · Sep 12, 2024 · 42950cb · 42950cb
1 parent 83eb0f8
commit 42950cb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json
@@ -15,7 +15,11 @@
     "@mui/material": "^5.15.10",
     "@mui/utils": "^5.15.11",
     "@opensystemslab/map": "1.0.0-alpha.3",
+<<<<<<< HEAD
     "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#94b20aa",
+=======
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#ab05224",
+>>>>>>> 98b06985 (switch planx-core ref)
     "@tiptap/core": "^2.4.0",
     "@tiptap/extension-bold": "^2.0.3",
     "@tiptap/extension-bubble-menu": "^2.1.13",

diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml