From 7ccae64dd1f4ee5ae97aa797d70d737d6935c120 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 27 May 2013 08:19:20 -0200
Subject: [PATCH] Fix merge issue

---
 src/Umbraco.Web/Umbraco.Web.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 9c085ff540..544df3bfd0 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1766,6 +1766,7 @@
     <Compile Include="WebServices\BulkPublishController.cs" />
     <Compile Include="WebServices\CoreStringsController.cs" />
     <Compile Include="WebServices\DomainsApiController.cs" />
+    <Compile Include="WebServices\EmbedMediaService.cs" />
     <Compile Include="WebServices\ExamineManagementApiController.cs" />
     <Compile Include="WebServices\FolderBrowserService.cs" />
     <Compile Include="WebServices\UmbracoAuthorizedHttpHandler.cs" />