damnit

1 files changed, 0 insertions, 36 deletions

diff --git a/.gitignore b/.gitignore
index 086b35d..8bccddd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,21 +7,15 @@ 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
@@ -64,36 +58,6 @@ 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/