Fix packages config

Author: KenitoInc

test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Build.AspNet/packages.config

@@ -10,23 +10,13 @@
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net452" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net452" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
-<<<<<<< HEAD
   <package id="Microsoft.OData.Client" version="7.11.1" targetFramework="net452" />
   <package id="Microsoft.OData.Core" version="7.11.1" targetFramework="net452" />
   <package id="Microsoft.OData.Edm" version="7.11.1" targetFramework="net452" />
   <package id="Microsoft.Owin" version="2.0.2" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
   <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
   <package id="Microsoft.Spatial" version="7.11.1" targetFramework="net452" />
-=======
-  <package id="Microsoft.OData.Client" version="7.9.1" targetFramework="net452" />
-  <package id="Microsoft.OData.Core" version="7.9.1" targetFramework="net452" />
-  <package id="Microsoft.OData.Edm" version="7.9.1" targetFramework="net452" />
-  <package id="Microsoft.Owin" version="2.0.2" targetFramework="net452" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
-  <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
-  <package id="Microsoft.Spatial" version="7.9.1" targetFramework="net452" />
->>>>>>> 82823d0c4 (updates)
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />