chore: fix conflicts

ubiquity · Apr 29, 2024 · b6d7d78 · b6d7d78
1 parent 418b5ad
commit b6d7d78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
     "axios": "^1.6.7",
     "dotenv": "^16.4.4",
     "ethers": "^5.7.2",
+    "node-fetch": "^3.3.2",
     "npm-run-all": "^4.1.5"
   },
   "devDependencies": {

diff --git a/tsconfig.json b/tsconfig.json
@@ -25,7 +25,7 @@
     /* Modules */
     "module": "commonjs" /* Specify what module code is generated. */,
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "Node16",                        /* Specify how TypeScript looks up a file from a given module specifier. */
+    // "moduleResolution": "Node16",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */