resolved conflicts

Author: anshss

decrypt-api-key-in-action/nodejs/package.json

@@ -3,21 +3,7 @@
   "version": "1.0.0",
   "main": "index.js",
   "license": "MIT",
-<<<<<<< HEAD
   "type": "module",
-=======
-  "dependencies": {
-    "@lit-protocol/auth-helpers": "^6.4.10",
-    "@lit-protocol/lit-auth-client": "^6.4.10",
-    "@lit-protocol/lit-node-client": "^6.4.10",
-    "@lit-protocol/types": "^6.4.10",
-    "@types/node": "^20.12.8",
-    "ethers": "^5.7.1",
-    "siwe": "^2.0.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.1.6"
-  },
->>>>>>> 8cb285d (fix: update-lit command to not make script executable each time)
   "scripts": {
     "test": "npx @dotenvx/dotenvx run -- mocha test/**/*.spec.ts"
   },

decrypt-api-key-in-action/nodejs/project.json

@@ -2,7 +2,6 @@
     "name": "decrypt-api-key-in-action-nodejs",
     "root": "decrypt-api-key-in-action/nodejs",
     "targets": {
-<<<<<<< HEAD
         "test-lit": {
             "executor": "nx:run-commands",
             "options": {
@@ -17,13 +16,3 @@
         }
     }
 }
-=======
-        "update-lit": {
-            "executor": "nx:run-commands",
-            "options": {
-                "command": "cd decrypt-api-key-in-action/nodejs && ../../scripts/update-lit.sh"
-            }
-        }
-    }
-}
->>>>>>> 1e8b871 (refactor: changed dir structure for decrypt-api-key-in-action as per templates)

eip-191-signing/nodejs/package.json

@@ -10,17 +10,10 @@
   },
   "dependencies": {
     "@dotenvx/dotenvx": "^0.37.1",
-<<<<<<< HEAD
     "@lit-protocol/auth-helpers": "^6.5.1",
     "@lit-protocol/constants": "^6.5.1",
     "@lit-protocol/contracts-sdk": "^6.5.1",
     "@lit-protocol/lit-node-client": "^6.5.1",
-=======
-    "@lit-protocol/auth-helpers": "^6.4.10",
-    "@lit-protocol/constants": "^6.4.10",
-    "@lit-protocol/contracts-sdk": "^6.4.10",
-    "@lit-protocol/lit-node-client-nodejs": "^6.4.10",
->>>>>>> 8cb285d (fix: update-lit command to not make script executable each time)
     "ethers": "5.7.2"
   },
   "devDependencies": {