From b1254201db6bbede2efd63253d73b39036fb855d Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 17 Feb 2026 14:34:48 +0000 Subject: [PATCH] Other half of the merge --- pnpm-lock.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 40840fedfd..74878c99d5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7726,14 +7726,9 @@ packages: matrix-events-sdk@0.0.1: resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==} -<<<<<<< HEAD matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e74eb4928e748194165b7200afe48e582bdc1fd7: resolution: {tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e74eb4928e748194165b7200afe48e582bdc1fd7} version: 40.2.0 -======= - matrix-js-sdk@40.3.0-rc.0: - resolution: {integrity: sha512-MxFPnlzca/g5Fq/MMN5jkzwExUv725/weW+Ids7Dwmcy34WC8NROBOhfqGJkwbAWLkJDEUKRe3+//2tHXmnnHQ==} ->>>>>>> staging engines: {node: '>=22.0.0'} matrix-web-i18n@3.6.0: @@ -18539,11 +18534,7 @@ snapshots: matrix-events-sdk@0.0.1: {} -<<<<<<< HEAD matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e74eb4928e748194165b7200afe48e582bdc1fd7: -======= - matrix-js-sdk@40.3.0-rc.0: ->>>>>>> staging dependencies: '@babel/runtime': 7.28.6 '@matrix-org/matrix-sdk-crypto-wasm': 17.1.0