csproj error on merge

digipost · Jun 1, 2015 · 50fff90 · 50fff90
1 parent 728c616
commit 50fff90
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/Digipost.Api.Client.Tests/Digipost.Api.Client.Tests.csproj b/Digipost.Api.Client.Tests/Digipost.Api.Client.Tests.csproj
@@ -68,11 +68,7 @@
     <Compile Include="Unittest\DigipostActionTests.cs" />
     <Compile Include="Unittest\DigipostApiTests.cs" />
   </ItemGroup>
-  <ItemGroup>
-<<<<<<< HEAD
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-=======
+  <ItemGroup>
     <ProjectReference Include="..\Digipost.Api.Client\Digipost.Api.Client.csproj">
       <Project>{309FBB5E-248F-42EC-81CC-4D4F4578CBFD}</Project>
       <Name>Digipost.Api.Client.Domain</Name>
@@ -120,8 +116,7 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
->>>>>>> master
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.