修复合并分支造成的bug

648540858

2022-03-04 3dc1e0368e63a40131afb10ab0c7e26f651d220b

1
2
3
4
5
6
7
8
9
10
11
12
13
14
.DS_Store
node_modules/
/dist/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
 
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln