From 4b5b3a7156fca4069ee1b369244328ec964cb328 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Tue, 22 Apr 2025 19:21:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=9F=E5=88=97=E5=88=97=E8=A1=A8=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/application/command.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Server/application/command.php b/Server/application/command.php
index 10f9c262..7d742436 100644
--- a/Server/application/command.php
+++ b/Server/application/command.php
@@ -19,9 +19,7 @@ return [
     'message:friendsList' => 'app\command\MessageFriendsListCommand', // 微信好友消息列表 √ 
     'message:chatroomList' => 'app\command\MessageChatroomListCommand', // 微信群聊消息列表 √
     'department:list' => 'app\command\DepartmentListCommand', // 部门列表 √
-<<<<<<< Updated upstream
     'content:sync' => 'app\command\SyncContentCommand', // 同步内容库 √
-=======
     'groupFriends:list' => 'app\command\GroupFriendsCommand', // 微信群好友列表
->>>>>>> Stashed changes
+
 ];