From d7a6fbc5fea46e503d469a1502d23df5d990cdf9 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 10 May 2022 15:27:04 +0100
Subject: [PATCH] Reset matrix-js-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 43e905214e..a465a7626b 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "17.2.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "3.44.0",
     "matrix-widget-api": "^0.1.0-beta.18",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 9339d8f11b..59d20b30fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8193,11 +8193,7 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-<<<<<<< HEAD
 "matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#4aef17b56798639906f26a8739043a3c5c5fde7e":
-=======
-"matrix-analytics-events@github:matrix-org/matrix-analytics-events#4aef17b56798639906f26a8739043a3c5c5fde7e":
->>>>>>> master
   version "0.0.1"
   resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/4aef17b56798639906f26a8739043a3c5c5fde7e"
 
@@ -8211,16 +8207,26 @@ matrix-events-sdk@^0.0.1-beta.7:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
   integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
 
-<<<<<<< HEAD
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "17.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/592f2931dcf720c8447a6f0e65ff98d515e65eb4"
-=======
 matrix-js-sdk@17.2.0:
   version "17.2.0"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.2.0.tgz#b757eccbef8676dbb9131f7ee0c31fd8039cc1c6"
   integrity sha512-/IrgHCSVUZNVcKoPO20OF9Xog9X79a1ckmR7FwF5lSTNdmC7eQvU0XcFYCi5IXo57du+im69lEw8dLbPngZhoQ==
->>>>>>> master
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "^0.0.1-beta.7"
+    p-retry "^4.5.0"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+  version "17.2.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/03a79dc6dd631caa2655bf02290ad3a58424f0c2"
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"
@@ -8242,16 +8248,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-<<<<<<< HEAD
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.43.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/c616bd7a62567a2789dc0538643bd56a062b5d27"
-=======
 matrix-react-sdk@3.44.0:
   version "3.44.0"
   resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.44.0.tgz#7c45f0606b6466d8d076b209b6e7622086927730"
   integrity sha512-b6s8166t2Qkc/SZyPKWdhG9I0Pe29jpCccDRR1PGh6dbKdllC9Kwv0h5EzAz5DXx6+QTkowHsjWq+v/5CUZLjg==
->>>>>>> master
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@sentry/browser" "^6.11.0"
@@ -8281,9 +8281,9 @@ matrix-react-sdk@3.44.0:
     is-ip "^3.1.0"
     jszip "^3.7.0"
     katex "^0.12.0"
-    linkify-element "4.0.0-beta.4"
-    linkify-string "4.0.0-beta.4"
-    linkifyjs "4.0.0-beta.4"
+    linkify-element "^4.0.0-beta.4"
+    linkify-string "^4.0.0-beta.4"
+    linkifyjs "^4.0.0-beta.4"
     lodash "^4.17.20"
     maplibre-gl "^1.15.2"
     matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#4aef17b56798639906f26a8739043a3c5c5fde7e"