Fix merge mistakes

package-lock.json

@@ -17,10 +17,6 @@
         "ws": "^8.8.1"
       },
       "bin": {
-        "bitburner-filesync": "npx/bitburner-filesync.js"
-      },
-      "devDependencies": {
-        "prettier": "^2.7.1"
         "bitburner-filesync": "npx/bitburner-filesync.ts"
       },
       "devDependencies": {
@@ -34,6 +30,7 @@
         "@types/ws": "^8.5.3",
         "chai": "^4.3.6",
         "mocha": "^10.0.0",
+        "prettier": "^2.7.1",
         "sinon": "^14.0.0",
         "sinon-chai": "^3.7.0"
       }
@@ -1408,6 +1405,21 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/prettier": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
     "node_modules/pretty-format": {
       "version": "29.1.2",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.1.2.tgz",
@@ -2399,23 +2411,7 @@
       "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
       "dev": true
     },
-    "node_modules/prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
     "deep-eql": {
-
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
       "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
@@ -2744,14 +2740,6 @@
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
       "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
     },
-
-    "prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-      "dev": true
-    },
-
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -2936,6 +2924,12 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
+    "prettier": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "dev": true
+    },
     "pretty-format": {
       "version": "29.1.2",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.1.2.tgz",

package.json

@@ -6,7 +6,6 @@
   "bin": "./npx/bitburner-filesync.ts",
   "main": "./npx/bitburner-filesync.ts",
   "scripts": {
-
     "format": "prettier -w .",
     "test:all": "mocha --recursive test",
     "test:single": "mocha",
@@ -36,8 +35,7 @@
     "ws": "^8.8.1"
   },
   "devDependencies": {
-
+    "prettier": "^2.7.1",
-    "prettier": "^2.7.1"
     "@types/chai": "^4.3.3",
     "@types/convict": "^6.1.1",
     "@types/expect": "^24.3.0",