parse-conflict-json
Advanced tools
Comparing version 1.1.0 to 1.1.1
@@ -1,2 +0,2 @@ | ||
const parseJSON = require('json-parse-better-errors') | ||
const parseJSON = require('json-parse-even-better-errors') | ||
const { diff } = require('just-diff') | ||
@@ -3,0 +3,0 @@ const { diffApply } = require('just-diff-apply') |
{ | ||
"name": "parse-conflict-json", | ||
"version": "1.1.0", | ||
"version": "1.1.1", | ||
"description": "Parse a JSON string that has git merge conflicts, resolving if possible", | ||
@@ -21,5 +21,5 @@ "author": "Isaac Z. Schlueter <i@izs.me> (https://izs.me)", | ||
"dependencies": { | ||
"json-parse-better-errors": "^1.0.2", | ||
"just-diff": "^3.0.1", | ||
"just-diff-apply": "^3.0.0" | ||
"just-diff-apply": "^3.0.0", | ||
"json-parse-even-better-errors": "^2.3.0" | ||
}, | ||
@@ -26,0 +26,0 @@ "repository": { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
5597
+ Addedjson-parse-even-better-errors@2.3.1(transitive)
- Removedjson-parse-better-errors@^1.0.2
- Removedjson-parse-better-errors@1.0.2(transitive)