Rolled back a commit on local, need to merge to resolve conflict

opencaesar · May 23, 2024 · 35e108c · 35e108c
2 parents 5cebdcd + 22e0a1c
commit 35e108c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -324,7 +324,8 @@
     "use-resize-observer": "^9.1.0",
     "uuid": "^9.0.0",
     "uuidv4": "^6.2.13",
-    "vscode-gradle": "^3.10.1"
+    "vscode-gradle": "^3.10.1",
+    "yarn": "^1.22.22"
   },
   "overrides": {
     "react-scripts": {

diff --git a/yarn.lock b/yarn.lock
@@ -10039,6 +10039,11 @@
     "y18n" "^5.0.5"
     "yargs-parser" "^21.1.1"
 
+"yarn@^1.22.22":
+  "integrity" "sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg=="
+  "resolved" "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz"
+  "version" "1.22.22"
+
 "yauzl@^2.3.1":
   "integrity" "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g=="
   "resolved" "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"