解决冲突

Hotline.sln

@@ -61,9 +61,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hotline.Ai.XingTang", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotline.Tests", "test\Hotline.Tests\Hotline.Tests.csproj", "{31855124-4EFC-47B9-A4D5-64822DE036E6}"
 EndProject
-<<<<<<< HEAD
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hotline.Pdf", "src\Hotline.Pdf\Hotline.Pdf.csproj", "{3AB75B51-A69D-4145-A564-1D9D1695992E}"
-=======
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure", "src\01.Infrastructure\Exam.Infrastructure\Exam.Infrastructure.csproj", "{FCAC41BE-6E47-700F-E226-BD01CAB4856A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure.Data", "src\01.Infrastructure\Exam.Infrastructure.Data\Exam.Infrastructure.Data.csproj", "{A0A928D1-0AF2-AECD-BF87-0E85442F9E47}"
@@ -71,7 +69,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure.Validation", "src\01.Infrastructure\Exam.Infrastructure.Validation\Exam.Infrastructure.Validation.csproj", "{FB1785EE-2C30-E682-F02A-32A37C351273}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure.Web", "src\01.Infrastructure\Exam.Infrastructure.Web\Exam.Infrastructure.Web.csproj", "{19E169D6-7A9A-26D1-6C57-4DDD1D32FF72}"
->>>>>>> feature/exam
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution