From 666f7cc4b9502e09f19436ba949c3c4ac01e444a Mon Sep 17 00:00:00 2001
From: tangchengming <445785772@qq.com>
Date: Mon, 20 Jan 2025 14:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mediation-page/components/MediationRoom.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue
index 3c17a9b..d2a6df0 100644
--- a/src/pages/mediation-page/components/MediationRoom.vue
+++ b/src/pages/mediation-page/components/MediationRoom.vue
@@ -367,10 +367,7 @@ export default {
       elapsedTime: 0,
       timerInterval: null,
       isRunning: false,
-<<<<<<< HEAD
       contactId: '',
-=======
-
       // 未接来电
       missedCallVisible: false,
       missedCallData: {
@@ -379,7 +376,6 @@ export default {
       // 视频提醒
       videoReminderVisible: false,
       videoReminderData: {}
->>>>>>> 5d050e83e2826b0ae129388b597928682f1bcc9a
     };
   },
   computed: {