From 8ac879099529bc18e0b2d66cd0471ccbf259417b Mon Sep 17 00:00:00 2001
From: "marc.sirisak" <marc.sirisak@beta.gouv.fr>
Date: Tue, 12 Nov 2024 18:24:20 +0100
Subject: [PATCH] fix: conflict v3.114.0
---
package.json | 17 +++--------------
.../tabs/user/LabsUserSettingsTab-test.tsx | 4 ----
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/package.json b/package.json
index e5a87503cec..d62c0afbc86 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,9 @@
{
"name": "matrix-react-sdk",
-<<<<<<< HEAD
"version": "0.0.0",
- "version-matrix": "3.113.0",
+ "version-matrix": "3.114.0",
"description": "SDK for matrix.org using React for Tchap",
"author": "DINUM",
-=======
- "version": "3.114.0",
- "description": "SDK for matrix.org using React",
- "author": "New Vector Ltd.",
->>>>>>> v3.114.0
"repository": {
"type": "git",
"url": "https://github.com/tchapgouv/matrix-react-sdk-tchap"
@@ -81,15 +75,10 @@
},
"dependencies": {
"@babel/runtime": "^7.12.5",
-<<<<<<< HEAD
- "@matrix-org/analytics-events": "^0.25.0",
- "@matrix-org/emojibase-bindings": "^1.1.2",
- "@matrix-org/matrix-wysiwyg": "2.37.9",
- "@matrix-org/olm": "3.2.15",
-=======
"@matrix-org/analytics-events": "^0.26.0",
"@matrix-org/emojibase-bindings": "^1.3.3",
->>>>>>> v3.114.0
+ "@matrix-org/matrix-wysiwyg": "2.37.9",
+ "@matrix-org/olm": "3.2.15",
"@matrix-org/react-sdk-module-api": "^2.4.0",
"@matrix-org/spec": "^1.7.0",
"@sentry/browser": "^8.0.0",
diff --git a/test/components/views/settings/tabs/user/LabsUserSettingsTab-test.tsx b/test/components/views/settings/tabs/user/LabsUserSettingsTab-test.tsx
index 3e504510f01..d4fa50df7d3 100644
--- a/test/components/views/settings/tabs/user/LabsUserSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/user/LabsUserSettingsTab-test.tsx
@@ -7,12 +7,8 @@ Please see LICENSE files in the repository root for full details.
*/
import React from "react";
-<<<<<<< HEAD
import { render, screen, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
-=======
-import { render, screen } from "jest-matrix-react";
->>>>>>> v3.114.0
import LabsUserSettingsTab from "../../../../../../src/components/views/settings/tabs/user/LabsUserSettingsTab";
import SettingsStore from "../../../../../../src/settings/SettingsStore";