Skip to content

Commit

Permalink
chore: merge conflicts resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
elevatebart committed Oct 14, 2020
1 parent e526b47 commit e7c4a36
Showing 1 changed file with 24 additions and 22 deletions.
46 changes: 24 additions & 22 deletions packages/jsx-typings/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
{
"name": "@vue/jsx-typings",
"version": "3.0.0-beta.4",
"description": "JSX typings for vue",
"sideEffects": false,
"files": ["index.d.ts"],
"repository": {
"type": "git",
"url": "git+https://github.com/vuejs/vue-next.git"
},
"keywords": [
"vue",
"jsx",
"typings",
"types"
],
"author": "Evan You",
"license": "MIT",
"bugs": {
"url": "https://github.com/vuejs/vue-next/issues"
},
"homepage": "https://github.com/vuejs/vue-next/tree/master/packages/jsx-typings#readme"
}
"name": "@vue/jsx-typings",
"version": "3.0.0",
"description": "JSX typings for vue",
"sideEffects": false,
"files": [
"index.d.ts"
],
"repository": {
"type": "git",
"url": "git+https://github.com/vuejs/vue-next.git"
},
"keywords": [
"vue",
"jsx",
"typings",
"types"
],
"author": "Evan You",
"license": "MIT",
"bugs": {
"url": "https://github.com/vuejs/vue-next/issues"
},
"homepage": "https://github.com/vuejs/vue-next/tree/master/packages/jsx-typings#readme"
}

0 comments on commit e7c4a36

Please sign in to comment.