gitignore

.gitignore

-.DS_Store
-node_modules/
-dist/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-**/*.log
-
-tests/**/coverage/
-tests/e2e/reports
-selenium-debug.log
-
-# Editor directories and files
-.idea
-.vscode
-=======
 node_modules
 .DS_Store
 .github
@@ -39,23 +23,12 @@ pnpm-debug.log*
 # Editor directories and files
 .idea
 # .vscode
->>>>>>> master
 *.suo
 *.ntvs*
 *.njsproj
 *.sln
-<<<<<<< HEAD
-*.local
-.editorconfig
-.eslintignore
-.eslintrc.js
-.env.*
-package-lock.json
-yarn.lock
-=======
 *.sw?
 /os_del.cmd
 /.vscode/
 /.history/
 /svn clear.bat
->>>>>>> master