Merge branch 'master'
This commit is contained in:
commit
633df638f9
14
.gitignore
vendored
14
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
.DS_Store
|
||||
node_modules
|
||||
/dist
|
||||
@ -21,3 +22,16 @@ pnpm-debug.log*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.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
|
||||
|
Loading…
x
Reference in New Issue
Block a user