fix: conflict

This commit is contained in:
kunkka 2020-10-27 23:17:15 +08:00
commit 912839433e
3 changed files with 2 additions and 4 deletions

1
.gitignore vendored
View file

@ -1,6 +1,7 @@
.DS_Store
node_modules
/dist
dist_electron
# local env files