Fix merge conflict.

jsonnext · Nov 18, 2024 · 8ede6ab · 8ede6ab
2 parents 20453d0 + 07c8b3a
commit 8ede6ab
Show file tree

Hide file tree

Showing 17 changed files with 1,255 additions and 2,245 deletions.
diff --git a/.changeset/few-ducks-explain.md b/.changeset/few-ducks-explain.md
diff --git a/.changeset/rich-tables-hug.md b/.changeset/rich-tables-hug.md
diff --git a/.changeset/sixty-pillows-work.md b/.changeset/sixty-pillows-work.md
diff --git a/.changeset/tender-rocks-smell.md b/.changeset/tender-rocks-smell.md
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,6 +27,7 @@ jobs:
         id: pnpm-install
         with:
           run_install: false
+          version: 9
 
       - name: Get pnpm store directory
         id: pnpm-cache

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,6 +17,7 @@ jobs:
         id: pnpm-install
         with:
           run_install: false
+          version: 9
 
       - name: Get pnpm store directory
         id: pnpm-cache

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # codemirror-json-schema
 
+## 0.7.9
+
+### Patch Changes
+
+- [#133](https://github.com/jsonnext/codemirror-json-schema/pull/133) [`4fd7cc6`](https://github.com/jsonnext/codemirror-json-schema/commit/4fd7cc69084bdad3c8c93d9d0f0a936fa120cbae) Thanks [@imolorhe](https://github.com/imolorhe)! - Get sub schema using parsed data for additional context
+
+- [#137](https://github.com/jsonnext/codemirror-json-schema/pull/137) [`29e2da5`](https://github.com/jsonnext/codemirror-json-schema/commit/29e2da5b5a16f8b076186e9623fe93ce6d086c30) Thanks [@xdavidwu](https://github.com/xdavidwu)! - Fix description markdown rendering in completion
+
+- [#144](https://github.com/jsonnext/codemirror-json-schema/pull/144) [`ef7f336`](https://github.com/jsonnext/codemirror-json-schema/commit/ef7f336f0d79397b19a37e76228f8a9b25070c89) Thanks [@imolorhe](https://github.com/imolorhe)! - updated to use fine grained shiki bundle
+
+- [#139](https://github.com/jsonnext/codemirror-json-schema/pull/139) [`bfbe613`](https://github.com/jsonnext/codemirror-json-schema/commit/bfbe613c81ba43e079e454b9c59a48a2f3887810) Thanks [@NickTomlin](https://github.com/NickTomlin)! - Move non essential packages to devDependencies
+
+- [#140](https://github.com/jsonnext/codemirror-json-schema/pull/140) [`bceace2`](https://github.com/jsonnext/codemirror-json-schema/commit/bceace285c137a53f3773219ee008ad1d856c770) Thanks [@NickTomlin](https://github.com/NickTomlin)! - Add CONTRIBUTING.md file
+
 ## 0.7.8
 
 ### Patch Changes