feat: rebase

FNNDSC · Jun 13, 2024 · 458a11b · 458a11b
1 parent 83b03e5
commit 458a11b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -1,6 +1,5 @@
 import { defineConfig, devices, PlaywrightTestConfig } from "@playwright/test";
 
-
 const SAFARI_BROWSERS: PlaywrightTestConfig["projects"] = [];
 
 if (process.env.TEST_SAFARI?.toLowerCase().startsWith('y')) {
@@ -65,7 +64,6 @@ export default defineConfig({
 
     ...SAFARI_BROWSERS
   ],
-
   webServer: {
     command: "env USE_BABEL_PLUGIN_ISTANBUL=y npm run dev:public",
     url: "http://localhost:25173",

diff --git a/tsconfig.json b/tsconfig.json
@@ -19,11 +19,7 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
-<<<<<<< HEAD
     "noImplicitAny":true,
-=======
-    "noImplicitAny": false
->>>>>>> 180631e3 (feat: Explore the idea of a store from which a user can install plugins)
   },
   "references": [{ "path": "./tsconfig.node.json" }]
 }