chore(main): release 2.0.2 (#19)

github-actions[bot] · web-flow · commit 31f1f327a2a0 · 2022-03-28T13:40:11.000-07:00
Co-authored-by: github-actions[bot] &lt;41898282+github-actions[bot]@users.noreply.github.com&gt;
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",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "parse-conflict-json",`
`3`		`- "version": "2.0.1",`
	`3`	`+ "version": "2.0.2",`
`4`	`4`	`"description": "Parse a JSON string that has git merge conflicts, resolving if possible",`
`5`	`5`	`"author": "GitHub Inc.",`
`6`	`6`	`"license": "ISC",`