From a864fc1fe83a4c79c09b1cf6493b94007e1f15cc Mon Sep 17 00:00:00 2001
From: sebastiaan <unknown@kiln.example.com>
Date: Tue, 11 Sep 2012 05:29:36 -0200
Subject: [PATCH] Fix merge problem

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

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 8f5ef4950a..28716e2582 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -273,9 +273,6 @@
     <None Include="config\FileSystemProviders.Release.config">
       <DependentUpon>FileSystemProviders.config</DependentUpon>
     </None>
-    <Content Include="config\EmbeddedMedia.config" />
-      <SubType>Designer</SubType>
-    </Content>
     <None Include="config\EmbeddedMedia.Release.config">
       <DependentUpon>EmbeddedMedia.config</DependentUpon>
     </None>
@@ -1905,6 +1902,7 @@
     <Content Include="config\UrlRewriting.config" />
     <Content Include="config\log4net.config" />
     <Content Include="config\FileSystemProviders.config" />
+    <Content Include="config\EmbeddedMedia.config" />
     <Content Include="web.config">
       <SubType>Designer</SubType>
     </Content>