From 3d757f533e05fbb2d82fe2cff5a13d134bc91f19 Mon Sep 17 00:00:00 2001
From: Pablo Marquez <pablo.marquez@cabify.com>
Date: Tue, 12 Sep 2023 11:04:18 +0200
Subject: [PATCH] solve conflicts and upgrade node

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8b15879..2b91d12 100644
--- 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"
   }
 }