Skip to content

Commit

Permalink
Merge branch 'main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Aug 6, 2021
2 parents ef68e42 + 6178c95 commit 07d2ffa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
],
"resolutions": {
"carbon-components": "^10.40.1",
"carbon-components-react": "^7.40.0",
"carbon-components-react": "^7.40.1",
"@carbon/elements": "^10.39.0",
"@carbon/icons": "^10.36.0",
"@carbon/icons-react": "^10.36.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4250,10 +4250,10 @@ capture-stack-trace@^1.0.0:
resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==

carbon-components-react@^7.33.0, carbon-components-react@^7.40.0, carbon-components-react@^7.40.1:
version "7.40.0"
resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.40.0.tgz#f2a7313dc77ad5d7a66798820857d97d83bd1415"
integrity sha512-tPHUFMTQprY8EFuW2WqAS2iJzzfgN6+jaguP3VmQzdsbl/IP5+/C+9hyXs1iQIhUmbvoq2SNozL+PWf9Srh9Ug==
carbon-components-react@^7.33.0, carbon-components-react@^7.40.1:
version "7.40.2"
resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.40.2.tgz#4fcdd1ac31603f880c9d75e42fdc80e11c39b6d3"
integrity sha512-fkfqMZxQk0hp033sLsj2KikMxSAD4U0yPhu7UprkX3XXsRTRkUBqhFNue7o1MlNGLug0gUL3gfs934lqrhvs4w==
dependencies:
"@carbon/feature-flags" "^0.5.0"
"@carbon/icons-react" "^10.36.0"
Expand Down

0 comments on commit 07d2ffa

Please sign in to comment.