From 11867820b38846a0ee6a8e7d74ab867d8330abfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=95=80=E9=93=AC=E9=85=B8=E9=92=BE?=
 <148796996+K2cr2O1@users.noreply.github.com>
Date: Fri, 23 Jan 2026 17:00:17 +0800
Subject: [PATCH] Update permission_manager.py

---
 core/managers/permission_manager.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/managers/permission_manager.py b/core/managers/permission_manager.py
index b00d7f6..90bcdb3 100644
--- a/core/managers/permission_manager.py
+++ b/core/managers/permission_manager.py
@@ -412,11 +412,7 @@ class PermissionManager(Singleton):
         """
         try:
             # 创建空的权限数据
-<<<<<<< HEAD
             empty_data: Dict[str, Dict] = {"users": {}}
-=======
-            empty_data = {"users": {}}
->>>>>>> 7229017e16735aef7dfc8379e31646b7a382d135
             
             # 原子性写入文件
             temp_file = self.data_file + ".tmp"