]> git.ipfire.org Git - thirdparty/vuejs/pinia.git/commitdiff
projects / thirdparty / vuejs / pinia.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c7b0a97)
chore: ok
authorEduardo San Martin Morote <posva13@gmail.com>
Wed, 13 Jul 2022 10:28:58 +0000 (12:28 +0200)
committerEduardo San Martin Morote <posva@users.noreply.github.com>
Wed, 13 Jul 2022 10:32:58 +0000 (12:32 +0200)
packages/nuxt/package.json patch | blob | blame | history

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 28a514207fb0f36a8d67d925cddb5381c2ff024d..b6f27d3ecbedf924ae322ede360decd5bc0df85c 100644 (file)
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -1,10 +1,6 @@
 {
   "name": "@pinia/nuxt",
-<<<<<<< HEAD
   "version": "0.2.1",
-=======
-  "version": "0.1.9",
->>>>>>> 57e75dc (chore: add back the name and missing configs)
   "description": "Nuxt Module for pinia",
   "keywords": [
     "pinia",
Mirror of https://github.com/vuejs/pinia.git