From 8836845f2aa2b74085b601c3e01423221061b94f Mon Sep 17 00:00:00 2001
From: Manuel Menegazzo <manuel.menegazzo@outlook.com>
Date: Tue, 3 Sep 2024 19:21:20 +0200
Subject: [PATCH] Fixed merge errors

---
 all.sln | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/all.sln b/all.sln
index 4a8fd0aca..12c1dca68 100644
--- a/all.sln
+++ b/all.sln
@@ -32,6 +32,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1BD1276E-D28A-45EA-89B1-6AD48471500D}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dapr.Actors.AspNetCore.Test", "test\Dapr.Actors.AspNetCore.Test\Dapr.Actors.AspNetCore.Test.csproj", "{9C1D6ABA-5EDE-4FA0-A8A9-0AB98CB74737}"
@@ -346,6 +347,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {65220BF2-EAE1-4CB2-AA58-EBE80768CB40}
 	EndGlobalSection
-EndGlobal
-lobalSection
-EndGlobal
+EndGlobal
\ No newline at end of file