Resolve conflict

onwidget · Jun 18, 2023 · 443e238 · 443e238
1 parent d945123
commit 443e238
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -44,14 +44,6 @@
     "build-storybook": "sb build -c ./example/.storybook -s example/public"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "@storybook/addons": "^6.0.0",
-    "@storybook/components": "^6.0.0",
-    "@storybook/core-events": "^6.0.0",
-    "@emotion/react": "^11.9.0",
-    "@emotion/styled": "^11.8.1",
-=======
->>>>>>> b48c8d5 (Update to storybook v7)
     "global": "^4.4.0"
   },
   "devDependencies": {