solve conflicts and upgrade node

cabify · Sep 12, 2023 · 3d757f5 · 3d757f5
1 parent 380ff8b
commit 3d757f5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -58,14 +58,14 @@
     "prettier": ">= 2.2.1"
   },
   "devDependencies": {
-    "prettier": "3.0.3"
     "eslint": "8.49.0",
+    "prettier": "3.0.3"
   },
   "publishConfig": {
     "access": "public"
   },
   "volta": {
-    "node": "14.18.1",
+    "node": "18.17.1",
     "yarn": "1.22.17"
   }
 }