未能成为人类

src/neobot/core/managers/plugin_manager.py

@@ -62,17 +62,12 @@ class PluginManager(Singleton):
         扫描并加载 `plugins` 目录下的所有插件。
         """
         # 使用 pathlib 获取更可靠的路径
-<<<<<<< HEAD
-        # 当前文件：core/managers/plugin_manager.py
-        # 目标：neobot/plugins/
-=======
         # 当前文件：src/neobot/core/managers/plugin_manager.py
         # 目标：src/neobot/plugins/
->>>>>>> eb9079744c82f8e254de084a3a089ef91c37e9dc
         current_dir = os.path.dirname(os.path.abspath(__file__))
         # 回退三级到项目根目录 (core/managers -> core -> neobot -> src)
         root_dir = os.path.dirname(os.path.dirname(os.path.dirname(current_dir)))
-        plugin_dir = os.path.join(root_dir, "src", "neobot", "plugins")
+        plugin_dir = os.path.join(root_dir, "neobot", "plugins")
         
         # 使用完整的包名：neobot.plugins
         package_name = "neobot.plugins"