Skip to content

Commit 5a91785

Browse files
github-actions[bot]wraithgar
authored andcommitted
chore: release 3.0.1
1 parent 13f103a commit 5a91785

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-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-
".": "3.0.0"
2+
".": "3.0.1"
33
}

CHANGELOG.md

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

3+
## [3.0.1](https://github.com/npm/parse-conflict-json/compare/v3.0.0...v3.0.1) (2023-03-16)
4+
5+
### Dependencies
6+
7+
* [`13f103a`](https://github.com/npm/parse-conflict-json/commit/13f103aba82f7ae65bea45c8075395bb1627d3f5) [#42](https://github.com/npm/parse-conflict-json/pull/42) bump just-diff from 5.2.0 to 6.0.0 (#42)
8+
39
## [3.0.0](https://github.com/npm/parse-conflict-json/compare/v2.0.2...v3.0.0) (2022-10-12)
410

511
### ⚠️ BREAKING CHANGES

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": "3.0.0",
3+
"version": "3.0.1",
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)