From 57e489214003c05070cbc1adbabc02baf81fa1a9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 26 May 2026 18:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TUICallKit-Vue3/manifest.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/TUICallKit-Vue3/manifest.json b/TUICallKit-Vue3/manifest.json
index ad2663b7..672b3365 100644
--- a/TUICallKit-Vue3/manifest.json
+++ b/TUICallKit-Vue3/manifest.json
@@ -58,17 +58,13 @@
             "subPackages" : true
         },
         "usingComponents" : true,
-<<<<<<< HEAD
+
         "plugins" : {
             "WechatSI" : {
                 "version" : "0.3.5",
                 "provider" : "wx069ba97219f66d99"
             }
         }
-=======
-        /* 节拍器后台播放需要,iOS 必需 */
-        "requiredBackgroundModes" : ["audio"]
->>>>>>> master
     },
     "mp-alipay" : {
         "usingComponents" : true