fix: resolved branch conflicts

stoplightio · Dec 12, 2024 · 09ce7b6 · 09ce7b6
2 parents 359c4e9 + be11c9a
commit 09ce7b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/examples/react-cra/package.json b/examples/react-cra/package.json
@@ -25,7 +25,8 @@
     "typescript": "^4.3.5"
   },
   "resolutions": {
-    "@babel/core": "^7.16.0"
+    "@babel/core": "^7.16.0",
+    "@types/react": "17.0.11"
   },
   "browserslist": {
     "production": [

diff --git a/yarn.lock b/yarn.lock
@@ -16226,6 +16226,9 @@ [email protected]:
     big-integer "^1.6.16"
 
 nanoid@^3.1.32, nanoid@^3.3.7:
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
   version "3.3.7"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==