
# Conflicts: # .gitignore # colorui/main.css # components/SearchBar.vue # components/loginPopup.vue # manifest.json # pages.json # pages/activityList/activityList.vue # pages/index/index.vue # pages/index/my.vue # pages/index/myJoin.vue # pagesActivity/bgSelect.vue # pagesActivity/myActivityDetail.vue # pagesActivity/winelist.vue # pagesMy/addAiad.vue # pagesMy/feedback.vue # pagesMy/myAddress.vue # pagesMy/myAttention.vue # pagesMy/myWineReview.vue # pagesMy/setting.vue
26 lines
251 B
Plaintext
26 lines
251 B
Plaintext
.DS_Store
|
|
node_modules/
|
|
unpackage/
|
|
dist/
|
|
|
|
# local env files
|
|
.env.local
|
|
.env.*.local
|
|
|
|
# Log files
|
|
npm-debug.log*
|
|
yarn-debug.log*
|
|
yarn-error.log*
|
|
|
|
# Editor directories and files
|
|
.idea
|
|
.vscode
|
|
*.suo
|
|
*.ntvs*
|
|
*.njsproj
|
|
*.sln
|
|
*.sw*
|
|
|
|
# HBuilderX
|
|
.hbuilderx/
|