未能成为人类

src/neobot/core/managers/permission_manager.py

@@ -433,17 +433,10 @@ def require_admin(func):
     """
     from functools import wraps
     from neobot.models.events.message import MessageEvent
-<<<<<<< HEAD
-    from neobot.core.managers import permission_manager
-
-    @wraps(func)
-    async def wrapper(event: MessageEvent, *args, **kwargs):
-=======
 
     @wraps(func)
     async def wrapper(event: MessageEvent, *args, **kwargs):
         from neobot.core.managers import permission_manager
->>>>>>> eb9079744c82f8e254de084a3a089ef91c37e9dc
         pm = permission_manager
         if not await pm.is_admin(event.user_id):
             await event.reply("此命令仅限管理员使用")