Skip to content

Commit 8ede6ab

Browse files
committed
Fix merge conflict.
2 parents 20453d0 + 07c8b3a commit 8ede6ab

17 files changed

+1255
-2245
lines changed

.changeset/few-ducks-explain.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/rich-tables-hug.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/sixty-pillows-work.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/tender-rocks-smell.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
id: pnpm-install
2828
with:
2929
run_install: false
30+
version: 9
3031

3132
- name: Get pnpm store directory
3233
id: pnpm-cache

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
id: pnpm-install
1818
with:
1919
run_install: false
20+
version: 9
2021

2122
- name: Get pnpm store directory
2223
id: pnpm-cache

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# codemirror-json-schema
22

3+
## 0.7.9
4+
5+
### Patch Changes
6+
7+
- [#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
8+
9+
- [#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
10+
11+
- [#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
12+
13+
- [#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
14+
15+
- [#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
16+
317
## 0.7.8
418

519
### Patch Changes

0 commit comments

Comments
 (0)