diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props index 704b948929..3b6b016a92 100644 --- a/dotnet/Directory.Packages.props +++ b/dotnet/Directory.Packages.props @@ -22,7 +22,6 @@ - diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx index b3581cd98a..fbb64e1165 100644 --- a/dotnet/agent-framework-dotnet.slnx +++ b/dotnet/agent-framework-dotnet.slnx @@ -66,7 +66,6 @@ ->>>>>>> main diff --git a/dotnet/samples/DevUIIntegration/EditorAgent/EditorAgent.csproj b/dotnet/samples/DevUIIntegration/EditorAgent/EditorAgent.csproj index ace52399c5..cbbbccac4a 100644 --- a/dotnet/samples/DevUIIntegration/EditorAgent/EditorAgent.csproj +++ b/dotnet/samples/DevUIIntegration/EditorAgent/EditorAgent.csproj @@ -9,7 +9,6 @@ - diff --git a/dotnet/samples/DevUIIntegration/WriterAgent/WriterAgent.csproj b/dotnet/samples/DevUIIntegration/WriterAgent/WriterAgent.csproj index e596b972fe..a30f969a80 100644 --- a/dotnet/samples/DevUIIntegration/WriterAgent/WriterAgent.csproj +++ b/dotnet/samples/DevUIIntegration/WriterAgent/WriterAgent.csproj @@ -9,7 +9,6 @@ -