chore(main): release 2.0.2 (#19)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
npm · Mar 28, 2022 · 31f1f32 · 31f1f32
1 parent 2e25855
commit 31f1f32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.0.2](https://github.com/npm/parse-conflict-json/compare/v2.0.1...v2.0.2) (2022-03-28)
+
+
+### Dependencies
+
+* bump just-diff-apply from 4.0.1 to 5.2.0 ([#12](https://github.com/npm/parse-conflict-json/issues/12)) ([3cdeb20](https://github.com/npm/parse-conflict-json/commit/3cdeb2088594229d7d0364d837edc68636e8e27e))
+
 ## v2.0.1
 
 ### Bug Fixes

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parse-conflict-json",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Parse a JSON string that has git merge conflicts, resolving if possible",
   "author": "GitHub Inc.",
   "license": "ISC",