fix merge resolution 2

yuriha-chan · Oct 4, 2023 · 329a060 · 329a060
1 parent 5b74fe4
commit 329a060
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -101,20 +101,11 @@
 		"@storybook/vue3-vite": "7.4.5",
 		"@testing-library/vue": "7.0.0",
 		"@types/escape-regexp": "0.0.1",
-<<<<<<< HEAD
-		"@types/estree": "1.0.1",
-		"@types/gulp": "4.0.13",
-		"@types/gulp-rename": "2.0.2",
-		"@types/iframe-resizer": "^3.5.9",
-		"@types/matter-js": "0.18.5",
-		"@types/micromatch": "4.0.2",
-		"@types/node": "20.4.5",
-=======
 		"@types/estree": "1.0.2",
+		"@types/iframe-resizer": "^3.5.9",
 		"@types/matter-js": "0.19.1",
 		"@types/micromatch": "4.0.3",
 		"@types/node": "20.7.1",
->>>>>>> 2023.9.3
 		"@types/punycode": "2.1.0",
 		"@types/sanitize-html": "2.9.1",
 		"@types/throttle-debounce": "5.0.0",