Skip to content

Commit e785946

Browse files
committed
fixup! rebase
1 parent 54c8386 commit e785946

File tree

2 files changed

+214
-107
lines changed

2 files changed

+214
-107
lines changed

packages/ui-components/package.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,11 @@
6565
"typescript": "catalog:"
6666
},
6767
"devDependencies": {
68-
<<<<<<< HEAD
6968
"@storybook/addon-styling-webpack": "~3.0.1",
7069
"@storybook/addon-themes": "~10.3.3",
7170
"@storybook/addon-webpack5-compiler-swc": "~4.0.3",
7271
"@storybook/react-webpack5": "~10.3.3",
73-
=======
7472
"@eslint-react/eslint-plugin": "~3.0.0",
75-
"@storybook/addon-styling-webpack": "~3.0.0",
76-
"@storybook/addon-themes": "~10.2.19",
77-
"@storybook/addon-webpack5-compiler-swc": "~4.0.2",
78-
"@storybook/react-webpack5": "~10.2.19",
79-
>>>>>>> 2c417d27c (chore(eslint): update to v10)
8073
"@testing-library/user-event": "~14.6.1",
8174
"@types/node": "catalog:",
8275
"cross-env": "catalog:",

0 commit comments

Comments
 (0)