打样申请代码

.gitignore

+<<<<<<< Updated upstream
 .DS_Store
+=======
+#.DS_Store
+>>>>>>> Stashed changes
 node_modules/
 dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 **/*.log
+<<<<<<< Updated upstream
 
 tests/**/coverage/
 tests/e2e/reports
@@ -22,5 +27,24 @@ selenium-debug.log
 .eslintignore
 .eslintrc.js
 .env.*
+=======
+#
+#tests/**/coverage/
+#tests/e2e/reports
+#selenium-debug.log
+#
+## Editor directories and files
+.idea
+.vscode
+#*.suo
+#*.ntvs*
+#*.njsproj
+#*.sln
+#*.local
+.editorconfig
+.eslintignore
+.eslintrc.js
+#.env.*
+>>>>>>> Stashed changes
 package-lock.json
 yarn.lock