chore: merge master and resolve package.json conflict
Both @braintree/sanitize-url (this branch) and @internationalized/date (master) were added to packages/ui dependencies; keeping both. Signed-off-by: Charles de Dreuille <charles.dedreuille@gmail.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@backstage/ui",
|
||||
"version": "0.14.0",
|
||||
"version": "0.15.0-next.0",
|
||||
"backstage": {
|
||||
"role": "web-library"
|
||||
},
|
||||
@@ -48,6 +48,7 @@
|
||||
"dependencies": {
|
||||
"@backstage/version-bridge": "workspace:^",
|
||||
"@braintree/sanitize-url": "^7.1.2",
|
||||
"@internationalized/date": "^3.12.0",
|
||||
"@remixicon/react": "^4.6.0",
|
||||
"@tanstack/react-table": "^8.21.3",
|
||||
"clsx": "^2.1.1",
|
||||
|
||||
Reference in New Issue
Block a user