From 984dcf95a6f8f1128c30bee8d677f29c05a55fd0 Mon Sep 17 00:00:00 2001
From: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
Date: Fri, 19 Jul 2024 11:36:22 +0200
Subject: [PATCH] Fix malformed Directory.Packages.props

---
 tests/Directory.Packages.props | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props
index 122edab67c..e56f69725b 100644
--- a/tests/Directory.Packages.props
+++ b/tests/Directory.Packages.props
@@ -5,13 +5,8 @@
   <ItemGroup>
     <!-- Microsoft packages -->
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
-<<<<<<< HEAD
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.5.24306.11" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.5.24306.7" />
-=======
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
->>>>>>> refs/remotes/origin/v14/dev
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageVersion Include="System.Data.Odbc" Version="9.0.0-preview.5.24306.7" />