From c848295b8b99356f42daa30582abd59cf15de84e Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 28 Mar 2023 14:46:52 +0100
Subject: [PATCH] Reset matrix-js-sdk back to develop branch

---
 yarn.lock | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3f4d0ac955..d5e233438a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1526,6 +1526,11 @@
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.4.tgz#1b20294e0354c3dcc9c7dc810d883198a4042f04"
   integrity sha512-mdaDKrw3P5ZVCpq0ioW0pV6ihviDEbS8ZH36kpt9stLKHwwDSopPogE6CkQhi0B1jn1yBUtOYi32mBV/zcOR7g==
 
+"@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.5":
+  version "0.1.0-alpha.5"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.5.tgz#60ede2c43b9d808ba8cf46085a3b347b290d9658"
+  integrity sha512-2KjAgWNGfuGLNjJwsrs6gGX157vmcTfNrA4u249utgnMPbJl7QwuUqh1bGxQ0PpK06yvZjgPlkna0lTbuwtuQw==
+
 "@matrix-org/matrix-wysiwyg@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-1.1.1.tgz#a07b13097e72a9bae220a647527d6418c5423827"
@@ -8078,17 +8083,17 @@ matrix-events-sdk@0.0.1:
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "23.5.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/7f2a4c256852d285d2639472b49c3c65fa48e7f8"
+  version "24.0.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d48b19e052b2a57974212ee1bb26aac46d60780d"
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.3"
+    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.5"
     another-json "^0.2.0"
     bs58 "^5.0.0"
     content-type "^1.0.4"
     loglevel "^1.7.1"
     matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
+    matrix-widget-api "^1.3.1"
     p-retry "4"
     sdp-transform "^2.14.1"
     unhomoglyph "^1.0.6"
@@ -8101,16 +8106,9 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-<<<<<<< HEAD
 "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
   version "3.68.0"
   resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f37ae1e230793232fcec65ae2b3ce1f15c2a630a"
-=======
-matrix-react-sdk@3.69.0:
-  version "3.69.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.69.0.tgz#63bc203531b45c37f9aa928b389c89b205f940d1"
-  integrity sha512-QmMAk+k/W2eb+KMHcOWcDtQzg2OQ5KV38lUY6UGOnvlM2n823YzKaio2a0OhMPxhf6GQ0yIKPGiGBftV+SdDQw==
->>>>>>> master
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.5.0"
@@ -8149,11 +8147,7 @@ matrix-react-sdk@3.69.0:
     maplibre-gl "^2.0.0"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-<<<<<<< HEAD
     matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
-=======
-    matrix-js-sdk "24.0.0"
->>>>>>> master
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"