Solved merge conflicts

ohcnetwork · Oct 15, 2024 · 633231d · 633231d
2 parents 24b3e8b + a45285a
commit 633231d
Show file tree

Hide file tree

Showing 3 changed files with 1,595 additions and 2,915 deletions.
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
@@ -3,7 +3,6 @@
     "baseUrl": "./",
     "target": "es5",
     "lib": ["es5", "dom", "es2015", "es2016", "es2017", "es2018", "es2019", "es2020"],
-    "types": ["cypress"],
     "typeRoots": ["./support"],
     "resolveJsonModule": true
   },