Skip to content

Commit

Permalink
chore(merge): resolve merge conflicts from main
Browse files Browse the repository at this point in the history
  • Loading branch information
annawen1 committed Apr 29, 2024
2 parents 59e8903 + c49916d commit bc69ecc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion web-components/packages/carbon-web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@carbon/ibm-products-styles": "^2.30.1",
"@carbon/styles": "1.54.0",
"@floating-ui/dom": "^1.6.3",
"@ibm/telemetry-js": "^1.3.0",
"@ibm/telemetry-js": "^1.5.0",
"flatpickr": "4.6.13",
"lit": "^3.1.0",
"lodash-es": "^4.17.21"
Expand Down

0 comments on commit bc69ecc

Please sign in to comment.