fixed package.json

victorgarciaesgi · Jan 4, 2024 · 7415b1a · 7415b1a
1 parent fd6ec80
commit 7415b1a
Showing 1 changed file with 0 additions and 38 deletions.
diff --git a/package.json b/package.json
@@ -66,34 +66,14 @@
     "mkdirp": "3.0.1",
     "nanoid": "5.0.4",
     "pathe": "1.1.1",
-<<<<<<< Updated upstream
-    "globby": "14.0.0"
-=======
     "prettier": "3.1.1"
->>>>>>> Stashed changes
   },
   "devDependencies": {
     "@intlify/core-base": "9.8.0",
     "@intlify/message-compiler": "9.8.0",
     "@intlify/shared": "9.8.0",
     "@intlify/vue-i18n-bridge": "1.1.0",
     "@intlify/vue-router-bridge": "1.1.0",
-<<<<<<< Updated upstream
-    "@nuxt/content": "2.9.0",
-    "@nuxt/devtools": "1.0.6",
-    "@nuxt/module-builder": "0.5.4",
-    "@nuxt/schema": "3.8.2",
-    "@nuxt/test-utils": "3.9.0",
-    "@nuxt/types": "2.17.2",
-    "@nuxtjs/eslint-config-typescript": "12.1.0",
-    "@nuxtjs/i18n": "8.0.0-rc.5",
-    "@nuxtjs/web-vitals": "0.2.6",
-    "@playwright/test": "1.40.1",
-    "@types/lodash-es": "4.17.12",
-    "@types/node": "20.10.5",
-    "@typescript-eslint/eslint-plugin": "6.15.0",
-    "@typescript-eslint/parser": "6.15.0",
-=======
     "@nuxt/content": "2.10.0",
     "@nuxt/devtools": "1.0.6",
     "@nuxt/module-builder": "0.5.5",
@@ -108,42 +88,24 @@
     "@types/node": "20.10.6",
     "@typescript-eslint/eslint-plugin": "6.17.0",
     "@typescript-eslint/parser": "6.17.0",
->>>>>>> Stashed changes
     "@vue/test-utils": "2.4.3",
     "bumpp": "9.2.1",
     "changelogithub": "0.13.2",
     "cross-env": "7.0.3",
     "eslint": "8.56.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-vue": "9.19.2",
-<<<<<<< Updated upstream
-    "nuxt": "3.8.2",
-    "nuxt-seo-kit": "1.3.13",
-    "playwright": "1.40.1",
-    "prettier": "3.1.1",
-    "tsd": "0.30.0",
-    "tslib": "2.6.2",
-    "typescript": "5.2.2",
-    "vitest": "1.1.0",
-    "vue": "3.3.13",
-=======
     "nuxt": "3.9.0",
     "nuxt-seo-kit": "1.3.13",
     "playwright": "1.40.1",
     "tsd": "0.30.3",
     "typescript": "5.3.3",
     "vitest": "1.1.1",
     "vue": "3.4.5",
->>>>>>> Stashed changes
     "vue-eslint-parser": "9.3.2",
     "vue-i18n": "9.8.0",
     "vue-i18n-routing": "1.2.0",
     "vue-router": "4.2.5",
-<<<<<<< Updated upstream
-    "vue-tsc": "1.8.25",
-    "zx": "7.2.3"
-=======
     "vue-tsc": "1.8.27"
->>>>>>> Stashed changes
   }
 }