yes

1 files changed, 37 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index ceaea36..086b35d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,15 +7,21 @@ yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
 .pnpm-debug.log*
+<<<<<<< HEAD
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 
+=======
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+>>>>>>> 1371cbd (yes)
 # Runtime data
 pids
 *.pid
 *.seed
 *.pid.lock
+<<<<<<< HEAD
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
@@ -58,6 +64,36 @@ web_modules/
 # Optional stylelint cache
 .stylelintcache
 
+=======
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+# nyc test coverage
+.nyc_output
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+# Bower dependency directory (https://bower.io/)
+bower_components
+# node-waf configuration
+.lock-wscript
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+# Dependency directories
+node_modules/
+jspm_packages/
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+# TypeScript cache
+*.tsbuildinfo
+# Optional npm cache directory
+.npm
+# Optional eslint cache
+.eslintcache
+# Optional stylelint cache
+.stylelintcache
+>>>>>>> 1371cbd (yes)
 # Microbundle cache
 .rpt2_cache/
 .rts2_cache_cjs/
@@ -91,7 +127,6 @@ out
 # Nuxt.js build / generate output
 .nuxt
 dist
-
 # Gatsby files
 .cache/
 # Comment in the public line in if your project uses Gatsby and not Next.js
@@ -130,3 +165,4 @@ dist
 .yarn/install-state.gz
 .pnp.*
 
+build/