Fixes merge issue

This commit is contained in:
Shannon Deminick
2013-04-20 03:58:15 +06:00
parent 1484fba1ad
commit 034aa6d8f9

View File

@@ -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">