From 4d637de70d8242a63e5e2868aa1542c9de2d3eae Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Tue, 11 Sep 2018 10:45:52 -0700
Subject: [PATCH] Fix merge error

---
 build/dependencies.props | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 4f714281ef..e20c21fa29 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -2,13 +2,8 @@
   <!-- These package versions may be overridden or updated by automation. -->
   <PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
     <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
-<<<<<<< HEAD
     <MicrosoftNETCoreAppPackageVersion>2.1.5-servicing-26906-03</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.5-servicing-26906-03</MicrosoftNETCoreDotNetAppHostPackageVersion>
-=======
-    <MicrosoftNETCoreAppPackageVersion>2.1.3-servicing-26722-02</MicrosoftNETCoreAppPackageVersion>
-    <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.3-servicing-26722-02</MicrosoftNETCoreDotNetAppHostPackageVersion>
->>>>>>> 51103305aa59c4cf84a1cf5327db2f96fdbe479c
   </PropertyGroup>
 
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />