From 034aa6d8f914ccc829df0e6930869a23e9560312 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Sat, 20 Apr 2013 03:58:15 +0600
Subject: [PATCH] Fixes merge issue

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

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 2e7e2675f4..8f7ffa2ed5 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -330,7 +330,6 @@
     </Compile>
     <Compile Include="Umbraco\dialogs\Sort.aspx.designer.cs">
       <DependentUpon>sort.aspx</DependentUpon>
-    </Compile>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Umbraco\Dialogs\EditMacro.aspx.designer.cs">