|
|
@@ -1,3 +1,4 @@
|
|
|
+<<<<<<< HEAD
|
|
|
.DS_Store
|
|
|
node_modules/
|
|
|
dist/
|
|
|
@@ -21,3 +22,35 @@ selenium-debug.log
|
|
|
package-lock.json
|
|
|
yarn.lock
|
|
|
/deploy.js
|
|
|
+=======
|
|
|
+# ---> Node
|
|
|
+# Logs
|
|
|
+logs
|
|
|
+*.log
|
|
|
+npm-debug.log*
|
|
|
+
|
|
|
+# Runtime data
|
|
|
+pids
|
|
|
+*.pid
|
|
|
+*.seed
|
|
|
+
|
|
|
+# Directory for instrumented libs generated by jscoverage/JSCover
|
|
|
+lib-cov
|
|
|
+
|
|
|
+# Coverage directory used by tools like istanbul
|
|
|
+coverage
|
|
|
+
|
|
|
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
|
|
|
+.grunt
|
|
|
+
|
|
|
+# node-waf configuration
|
|
|
+.lock-wscript
|
|
|
+
|
|
|
+# Compiled binary addons (http://nodejs.org/api/addons.html)
|
|
|
+build/Release
|
|
|
+
|
|
|
+# Dependency directory
|
|
|
+# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
|
|
|
+node_modules
|
|
|
+
|
|
|
+>>>>>>> aaa17c019fcc818131f813b89c517a9a4e6dd7b0
|
