chore: resolve conflict

aibayanyu20 · aibayanyu20 · commit 796f01d1b5c8 · 2023-07-15T11:08:53.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ant-design-vue/nuxt",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0",
   "description": "ant-design-vue-nuxt module",
   "repository": "vueComponent/ant-design-vue-nuxt",
   "license": "MIT",
@@ -52,4 +52,4 @@
     "nuxt": "^3.5.1",
     "vitest": "^0.31.1"
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ant-design-vue/nuxt",`
`3`		`- "version": "1.0.0-alpha.1",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"description": "ant-design-vue-nuxt module",`
`5`	`5`	`"repository": "vueComponent/ant-design-vue-nuxt",`
`6`	`6`	`"license": "MIT",`
`@@ -52,4 +52,4 @@`
`52`	`52`	`"nuxt": "^3.5.1",`
`53`	`53`	`"vitest": "^0.31.1"`
`54`	`54`	`}`
`55`		`-}`
	`55`	`+}`