chore: solve conflicts

onebeyond · Oct 21, 2021 · d8c0e8b · d8c0e8b
1 parent e451b8e
commit d8c0e8b
Show file tree

Hide file tree

Showing 5 changed files with 1,006 additions and 996 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,8 @@ yarn-error.log*
 license-report.md
 
 .idea
+<<<<<<< Updated upstream
 .eslintcache
+=======
+.eslintcache
+>>>>>>> Stashed changes