From be049f90936089f8fe1185266b5db1a4f7d5dbd6 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 29 Apr 2013 12:36:03 -0200
Subject: [PATCH] Fix merge issue

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 6bb9dbcb9d..bb7801cf95 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -257,10 +257,6 @@
       <Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
     </ProjectReference>
-    <ProjectReference Include="..\umbraco.webservices\umbraco.webservices.csproj">
-      <Project>{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}</Project>
-      <Name>umbraco.webservices</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
       <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
       <Name>Umbraco.Web</Name>
@@ -644,13 +640,6 @@
     <Content Include="Umbraco\Plugins\UGoLive\throbber.gif" />
     <Content Include="Umbraco\Plugins\UGoLive\tick.png" />
     <Content Include="Umbraco\Settings\Views\EditView.aspx" />
-    <Content Include="Umbraco\Webservices\Api\DocumentService.asmx" />
-    <Content Include="Umbraco\Webservices\Api\FileService.asmx" />
-    <Content Include="Umbraco\Webservices\Api\MaintanceService.asmx" />
-    <Content Include="Umbraco\Webservices\Api\MediaService.asmx" />
-    <Content Include="Umbraco\Webservices\Api\MemberService.asmx" />
-    <Content Include="Umbraco\Webservices\Api\StylesheetService.asmx" />
-    <Content Include="Umbraco\Webservices\Api\TemplateService.asmx" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.validate.min.js" />
     <Content Include="Umbraco_Client\CodeMirror\Js\Lib\codemirror.css" />
     <Content Include="Umbraco_Client\CodeMirror\Js\Lib\codemirror.js" />