Merge branch 'master'

This commit is contained in:
BlackTeay 2021-03-20 16:06:19 +08:00
commit 633df638f9
2 changed files with 20 additions and 0 deletions

14
.gitignore vendored
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
.DS_Store .DS_Store
node_modules node_modules
/dist /dist
@ -21,3 +22,16 @@ pnpm-debug.log*
*.njsproj *.njsproj
*.sln *.sln
*.sw? *.sw?
=======
# ---> Vue
# gitignore template for Vue.js projects
#
# Recommended template: Node.gitignore
# TODO: where does this rule come from?
docs/_book
# TODO: where does this rule come from?
test/
>>>>>>> cc73829d1ccba87b56bfd777b66614e1d855efb7

View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
# jlntv-board-vue # jlntv-board-vue
## Project setup ## Project setup
@ -22,3 +23,8 @@ yarn lint
### Customize configuration ### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/). See [Configuration Reference](https://cli.vuejs.org/config/).
=======
# vue-with-vant
带有vant的Vue基础工程
>>>>>>> cc73829d1ccba87b56bfd777b66614e1d855efb7