From dd6e2fa586833b3b5fb8fc2f1971cf8c73c15275 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 08:49:58 +0000
Subject: [PATCH 1/2] Bump prettier from 3.0.2 to 3.0.3

Bumps [prettier](https://github.com/prettier/prettier) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 26ad93a..26cf8ba 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "eslint": "8.47.0",
-    "prettier": "3.0.2"
+    "prettier": "3.0.3"
   },
   "publishConfig": {
     "access": "public"
diff --git a/yarn.lock b/yarn.lock
index a049d7f..c235818 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1768,10 +1768,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.2.tgz#78fcecd6d870551aa5547437cdae39d4701dca5b"
-  integrity sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==
+prettier@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643"
+  integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==
 
 prop-types@^15.8.1:
   version "15.8.1"

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 2/2] 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"
   }
 }