Skip to content

Commit 323a738

Browse files
committed
fix: accept incoming changes for package files
1 parent 46f5725 commit 323a738

2 files changed

Lines changed: 0 additions & 69 deletions

File tree

package-lock.json

Lines changed: 0 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,13 @@
1010
],
1111
"author": "http://json-schema.org",
1212
"license": "MIT",
13-
<<<<<<< HEAD
14-
"dependencies": {
15-
"@hyperjump/browser": "^1.3.1",
16-
"@hyperjump/json-pointer": "^1.1.1",
17-
"@hyperjump/json-schema": "^1.17.2",
18-
"@hyperjump/pact": "^1.4.0",
19-
"@hyperjump/uri": "^1.3.2",
20-
"json-stringify-deterministic": "^1.0.12"
21-
},
22-
"devDependencies": {
23-
=======
2413
"devDependencies": {
2514
"@hyperjump/browser": "^1.3.1",
2615
"@hyperjump/json-pointer": "^1.1.1",
2716
"@hyperjump/json-schema": "^1.17.4",
2817
"@hyperjump/pact": "^1.4.0",
2918
"@hyperjump/uri": "^1.3.2",
3019
"json-stringify-deterministic": "^1.0.12",
31-
>>>>>>> 470010d59ba1c4714cfcdf056d60818f2a782309
3220
"jsonc-parser": "^3.3.1"
3321
}
3422
}

0 commit comments

Comments
 (0)