From 0bb7f3d3ee3d8dd8095c2ae5cc75753f2da82353 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 13 Dec 2021 12:29:09 -0700 Subject: [PATCH] Fix conflict chunk in lockfile --- yarn.lock | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index d999bb4cce..018da7230b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6027,20 +6027,13 @@ 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@https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1": version "0.0.1" resolved "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1" "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "15.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c0fbed914e454f1dfac9bdd5dec7165f90b0e3e4" -======= -matrix-js-sdk@15.2.1: version "15.2.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.2.1.tgz#61e9742ccacfe486231415372e12cb13607b5d7c" - integrity sha512-e0/NE6LUfDLKLdWNFyH5OGt2QHybandrC0x9qgj7P1/fe+zgLGGd8W4XGDa5CMHjjqm/OoLMam44+0+FafojlQ== ->>>>>>> master + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/169b6b55727d0eea181a31b3170439c9a355065b" dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0"