chore: merge conflicts

americanexpress · Jan 30, 2023 · 1552c23 · 1552c23
2 parents 3083840 + 98f1f50
commit 1552c23
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 138 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -161,7 +161,7 @@
     "conventional-changelog-cli": "^2.2.2",
     "cors": "^2.8.5",
     "cross-env": "^7.0.3",
-    "danger": "^11.1.4",
+    "danger": "^11.2.2",
     "eslint": "^7.32.0",
     "eslint-config-amex": "^14.2.1",
     "eslint-plugin-es": "^4.1.0",