fix(llm):修复合并错误

2025-06-19 05:09:15 +08:00 · 2025-06-19 05:09:15 +08:00 · 667b3c083a
commit 667b3c083a
parent 856270753e
1 changed files with 0 additions and 6 deletions
--- a/Admin.NET/Admin.NET.Web.Core/ProjectOptions.cs
+++ b/Admin.NET/Admin.NET.Web.Core/ProjectOptions.cs
@ -43,14 +43,8 @@ public static class ProjectOptions
        services.Configure<ClientRateLimitOptions>(App.Configuration.GetSection("ClientRateLimiting"));
        services.Configure<ClientRateLimitPolicies>(App.Configuration.GetSection("ClientRateLimitPolicies"));

-<<<<<<< HEAD
        services.AddConfigurableOptions<LLMOptions>();        //基于Microsoft Semantic Kernel实现,也是本应用的默认实现

-=======
-        services.AddConfigurableOptions<LLMCustomOptions>();  // 手动实现LLM接口配置选项
-        services.AddConfigurableOptions<LLMOptions>();        // 基于Microsoft Semantic Kernel实现,也是本应用的默认实现
->>>>>>> f408a01a2d83c2d384dcbdb16eab344e4d437ab3
-
        return services;
    }
 }