Skip to content

Commit a63e70a

Browse files
committed
chore: fix conflict
1 parent 877283b commit a63e70a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Changelog
22

33

4-
## v1.1.0
4+
## v1.0.0
55

6-
[compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.1.0)
6+
[compare changes](https://undefined/undefined/compare/v1.0.0-alpha.1...v1.0.0)
77

88

99
### 🚀 Enhancements

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ant-design-vue/nuxt",
3-
"version": "1.1.0",
3+
"version": "1.0.0",
44
"description": "ant-design-vue-nuxt module",
55
"repository": "vueComponent/ant-design-vue-nuxt",
66
"license": "MIT",
@@ -27,7 +27,7 @@
2727
"dev:prepare": "nuxt-module-build --stub && nuxi prepare playground",
2828
"release": "npm run lint && npm run test && npm run prepack && changelogen --release && npm publish && git push --follow-tags",
2929
"build": "npm run lint && npm run test && npm run prepack",
30-
"changelog": "changelogen --release --prerelease --output CHANGELOG.md",
30+
"changelog": "changelogen --release --output CHANGELOG.md",
3131
"lint": "eslint .",
3232
"test": "vitest run",
3333
"test:watch": "vitest watch"
@@ -48,4 +48,4 @@
4848
"nuxt": "^3.5.1",
4949
"vitest": "^0.31.1"
5050
}
51-
}
51+
}

0 commit comments

Comments
 (0)