From 872a1f72dda5db7df100073f782c9570825ce5ac Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 13 Jul 2022 12:28:58 +0200
Subject: [PATCH] chore: ok

---
 packages/nuxt/package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 28a51420..b6f27d3e 100644
--- 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",
-- 
2.47.2