Skip to content

Commit 7fd7ca6

Browse files
dependabot pr #18
2 parents 3a30bd2 + a803747 commit 7fd7ca6

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

backend/idp-repository/OAuth-OIDC/keycloak/vulnKeycloak/themes/keycloak-preview/account/resources/package-lock.json

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

backend/idp-repository/OAuth-OIDC/keycloak/vulnKeycloak/themes/keycloak-preview/account/resources/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@
1313
"dependencies": {
1414
"@patternfly/patternfly": "^1.0.248",
1515
"@patternfly/react-core": "^2.9.2",
16+
<<<<<<< HEAD
1617
"axios": "^0.18.0",
1718
"moment": "^2.29.2",
19+
=======
20+
"axios": "^0.21.2",
21+
"moment": "^2.22.2",
22+
>>>>>>> dependabot/npm_and_yarn/backend/idp-repository/OAuth-OIDC/keycloak/vulnKeycloak/themes/keycloak-preview/account/resources/axios-0.21.2
1823
"react": "^16.8.5",
1924
"react-dom": "^16.8.5",
2025
"react-router-dom": "^4.3.1",

0 commit comments

Comments
 (0)