<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 61798a0 (lin提交整合版本（lin,li,cai）)
.DS_Store
node_modules/
dist/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
**/*.log
<<<<<<< HEAD

tests/**/coverage/
tests/e2e/reports
selenium-debug.log

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.local

package-lock.json
yarn.lock
=======
# Build and Release Folders
bin-debug/
bin-release/
[Oo]bj/
[Bb]in/
=======
>>>>>>> 61798a0 (lin提交整合版本（lin,li,cai）)

tests/**/coverage/
tests/e2e/reports
selenium-debug.log

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.local

<<<<<<< HEAD
# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
# should NOT be excluded as they contain compiler settings and other important
# information for Eclipse / Flash Builder.
>>>>>>> 523b0af (Initial commit)
=======
package-lock.json
yarn.lock
>>>>>>> 61798a0 (lin提交整合版本（lin,li,cai）)