Skip to content

Commit 072b316

Browse files
committed
fix package.json
1 parent 2ac51c2 commit 072b316

2 files changed

Lines changed: 37 additions & 57 deletions

File tree

package-lock.json

Lines changed: 37 additions & 51 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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,7 @@
221221
"fast-deep-equal": "^3.1.1",
222222
"google-auth-library": "^10.6.2",
223223
"jsonwebtoken": "^9.0.0",
224-
<<<<<<< HEAD
225224
"jwks-rsa": "^3.1.0"
226-
=======
227-
"jwks-rsa": "^4.0.1",
228-
"node-forge": "^1.4.0",
229-
"uuid": "^11.0.2"
230-
>>>>>>> 9d14495a (chore(deps): bump jwks-rsa to 4.0.1 (#3125))
231225
},
232226
"optionalDependencies": {
233227
"@google-cloud/firestore": "^8.6.0",

0 commit comments

Comments
 (0)