From 13e555f50b1eff0a2ed8d8aa8570a84efb83002b Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Fri, 29 Mar 2013 23:52:40 +0600
Subject: [PATCH] Fixed merge issue based on overlap with class + namespace
 name.

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         | 16 ++++++++--------
 src/Umbraco.Web.UI/umbraco/Create.aspx.cs        |  2 +-
 .../umbraco/Create.aspx.designer.cs              |  7 ++++---
 src/Umbraco.Web.UI/umbraco/create.aspx           |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj               |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 65aa2af623..4e57b2aaa1 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -277,13 +277,6 @@
       <DependentUpon>loadStarterKits.ascx</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Umbraco\Create\PartialViewMacro.ascx.cs">
-      <DependentUpon>PartialViewMacro.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Create\PartialViewMacro.ascx.designer.cs">
-      <DependentUpon>PartialViewMacro.ascx</DependentUpon>
-    </Compile>
     <Compile Include="Umbraco\Create.aspx.cs">
       <DependentUpon>create.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -291,6 +284,13 @@
     <Compile Include="Umbraco\Create.aspx.designer.cs">
       <DependentUpon>create.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Umbraco\Create\PartialViewMacro.ascx.cs">
+      <DependentUpon>PartialViewMacro.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Umbraco\Create\PartialViewMacro.ascx.designer.cs">
+      <DependentUpon>PartialViewMacro.ascx</DependentUpon>
+    </Compile>
     <Compile Include="Umbraco\Developer\Macros\EditMacro.aspx.cs">
       <DependentUpon>editMacro.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -434,6 +434,7 @@
     <Content Include="Umbraco\Config\Lang\ru.xml" />
     <Content Include="Umbraco\Config\Lang\zh.xml" />
     <Content Include="Umbraco\Controls\Tree\CustomTreeService.asmx" />
+    <Content Include="Umbraco\create.aspx" />
     <Content Include="Umbraco\Create\PartialViewMacro.ascx" />
     <Content Include="Umbraco\Dashboard\Images\access-denied.png" />
     <Content Include="Umbraco\Dashboard\Scripts\swfobject.js" />
@@ -1913,7 +1914,6 @@
     <Content Include="Umbraco\Translation\default.aspx" />
     <Content Include="Umbraco\Translation\preview.aspx" />
     <Content Include="Umbraco\Translation\xml.aspx" />
-    <Content Include="Umbraco\create.aspx" />
     <Content Include="Umbraco\Create\content.ascx" />
     <Content Include="Umbraco\Create\language.ascx">
       <SubType>UserControl</SubType>
diff --git a/src/Umbraco.Web.UI/umbraco/Create.aspx.cs b/src/Umbraco.Web.UI/umbraco/Create.aspx.cs
index b30e2a3f3b..204285f180 100644
--- a/src/Umbraco.Web.UI/umbraco/Create.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/Create.aspx.cs
@@ -9,7 +9,7 @@ using umbraco.cms.presentation.Trees;
 
 namespace Umbraco.Web.UI.Umbraco
 {
-    public partial class Create : global::umbraco.cms.presentation.Create
+    public partial class CreateDialog : global::umbraco.cms.presentation.Create
     {
 
         //protected override void OnLoad(EventArgs e)
diff --git a/src/Umbraco.Web.UI/umbraco/Create.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/Create.aspx.designer.cs
index 12722853d4..1e11eaf00d 100644
--- a/src/Umbraco.Web.UI/umbraco/Create.aspx.designer.cs
+++ b/src/Umbraco.Web.UI/umbraco/Create.aspx.designer.cs
@@ -8,9 +8,10 @@
 //------------------------------------------------------------------------------
 
 namespace Umbraco.Web.UI.Umbraco {
-    
-    
-    public partial class Create {
+
+
+    public partial class CreateDialog
+    {
         
         /// <summary>
         /// AccessError control.
diff --git a/src/Umbraco.Web.UI/umbraco/create.aspx b/src/Umbraco.Web.UI/umbraco/create.aspx
index ba4b091eda..2b112f516b 100644
--- a/src/Umbraco.Web.UI/umbraco/create.aspx
+++ b/src/Umbraco.Web.UI/umbraco/create.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="c#" MasterPageFile="masterpages/umbracoDialog.Master" Codebehind="Create.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Create" %>
+<%@ Page Language="c#" MasterPageFile="masterpages/umbracoDialog.Master" Codebehind="CreateDialog.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.CreateDialog" %>
 
 <%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="umbraco" %>
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 506ef84d73..388e45eb4f 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -359,9 +359,9 @@
     <Compile Include="umbraco.presentation\ScriptingMacroResult.cs" />
     <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="umbraco.presentation\umbraco\create\MacroPartialViewTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\create\PartialViewTasks.cs" />
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>