Correct checked-in merge conflict (#27463)

dotnet · Feb 17, 2022 · 36e6aa4 · 36e6aa4
1 parent 93d923f
commit 36e6aa4
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -47,23 +47,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-<<<<<<< HEAD
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22103.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
-=======
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22107.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22107.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
->>>>>>> release/6.0
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>