Skip to content

Commit 708bbe1

Browse files
chore: release 3.0.0 (#28)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 11ac781 commit 708bbe1

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "2.0.2"
2+
".": "3.0.0"
33
}

CHANGELOG.md

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

3+
## [3.0.0](https://github.com/npm/parse-conflict-json/compare/v2.0.2...v3.0.0) (2022-10-12)
4+
5+
### ⚠️ BREAKING CHANGES
6+
7+
* `parse-conflict-json` is now compatible with the following semver range for node: `^14.17.0 || ^16.13.0 || >=18.0.0`
8+
9+
### Features
10+
11+
* [`97eebf8`](https://github.com/npm/parse-conflict-json/commit/97eebf80dadec116682975047ace974c7989a4ed) [#27](https://github.com/npm/parse-conflict-json/pull/27) postinstall for dependabot template-oss PR (@lukekarrys)
12+
13+
### Dependencies
14+
15+
* [`11ac781`](https://github.com/npm/parse-conflict-json/commit/11ac781a568ad814de8ce021f201d1c03f5ca38f) [#33](https://github.com/npm/parse-conflict-json/pull/33) bump json-parse-even-better-errors from 2.3.1 to 3.0.0
16+
317
### [2.0.2](https://github.com/npm/parse-conflict-json/compare/v2.0.1...v2.0.2) (2022-03-28)
418

519

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parse-conflict-json",
3-
"version": "2.0.2",
3+
"version": "3.0.0",
44
"description": "Parse a JSON string that has git merge conflicts, resolving if possible",
55
"author": "GitHub Inc.",
66
"license": "ISC",

0 commit comments

Comments
 (0)