From 236e56f4e989be3d20e3cf144d07630411867db6 Mon Sep 17 00:00:00 2001
From: jing <1683105490@qq.com>
Date: Fri, 9 Oct 2026 17:01:16 +0800
Subject: [PATCH] =?UTF-8?q?chore=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .local.config.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.local.config.js b/.local.config.js
index f81a81b..37eda55 100644
--- a/.local.config.js
+++ b/.local.config.js
@@ -257,11 +257,11 @@ const localDevConfig = ({
 // })['2811']; // 本地
 // })['5g-317']; // 电磁兼容
 // })['5g-351']; // 
-<<<<<<< HEAD
- })['5g-97']; // 本地
-=======
+
+
+
  })['2881']; // 本地
->>>>>>> temp221
+
 // })['local-2']; // 本地
 // })['local-11']; // 本地
 // })['1-test']; // test