resolve conflict

Jicheng Lu · Jicheng Lu · commit 5375da1ff458 · 2026-04-16T11:15:28.000-05:00
diff --git a/src/Infrastructure/BotSharp.Abstraction/MCP/Models/McpServerConfigModel.cs b/src/Infrastructure/BotSharp.Abstraction/MCP/Models/McpServerConfigModel.cs
@@ -40,14 +40,7 @@ public class McpHttpServerConfig : McpHttpServerConfigBase
 {
 }
 
-public class McpHttpServerConfigBase
-{
-    public string EndPoint { get; set; } = null!;
-    public TimeSpan ConnectionTimeout { get; init; } = TimeSpan.FromSeconds(30);
-    public Dictionary<string, string>? AdditionalHeaders { get; set; }
-}
-
-public class McpHttpServerConfig
+public abstract class McpHttpServerConfigBase
 {
     public string EndPoint { get; set; } = null!;
     public TimeSpan ConnectionTimeout { get; init; } = TimeSpan.FromSeconds(30);

Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,7 @@ public class McpHttpServerConfig : McpHttpServerConfigBase`
`40`	`40`	`{`
`41`	`41`	`}`
`42`	`42`
`43`		`-public class McpHttpServerConfigBase`
`44`		`-{`
`45`		`- public string EndPoint { get; set; } = null!;`
`46`		`- public TimeSpan ConnectionTimeout { get; init; } = TimeSpan.FromSeconds(30);`
`47`		`- public Dictionary<string, string>? AdditionalHeaders { get; set; }`
`48`		`-}`
`49`		`-`
`50`		`-public class McpHttpServerConfig`
	`43`	`+public abstract class McpHttpServerConfigBase`
`51`	`44`	`{`
`52`	`45`	`public string EndPoint { get; set; } = null!;`
`53`	`46`	`public TimeSpan ConnectionTimeout { get; init; } = TimeSpan.FromSeconds(30);`