From eadb1bb1941aa4fa1a5e8764f1651722cb5d0a05 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Tue, 9 Apr 2013 07:54:32 +0600
Subject: [PATCH] Fixes merge issues

---
 .../webservices/CheckForUpgrade.asmx.cs       |  4 +--
 .../umbraco/webservices/nodeSorter.asmx.cs    | 30 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
index 113f8f8d07..d12668d26b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
@@ -40,7 +40,7 @@ namespace umbraco.presentation.webservices
         {
             bool isUpgrade = false;
             // if it's an upgrade, you'll need to be logged in before we allow this call
-            if (!String.IsNullOrEmpty(Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
+            if (!String.IsNullOrEmpty(global::Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
             {
                 isUpgrade = true;
                 legacyAjaxCalls.Authorize();
@@ -63,7 +63,7 @@ namespace umbraco.presentation.webservices
             installCookie.SetValue(installId.ToString());
 
             string dbProvider = String.Empty;
-            if (!String.IsNullOrEmpty(Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
+            if (!String.IsNullOrEmpty(global::Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
             dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
 
             org.umbraco.update.CheckForUpgrade check = new global::umbraco.presentation.org.umbraco.update.CheckForUpgrade();
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
index e5025f8d3f..48dc9cf12b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
@@ -93,28 +93,28 @@ namespace umbraco.presentation.webservices
                     
                     if (isContent)
                     {
-                                    var document = new Document(int.Parse(tmp[i]));
-                                    var published = document.Published;
-                                    document.sortOrder = i;
-                                    document.Save();
+                        var document = new Document(int.Parse(tmp[i]));
+                        var published = document.Published;
+                        document.sortOrder = i;
+                        document.Save();
                         // refresh the xml for the sorting to work
-                        if (d.Published)
+                        if (published)
                         {
-                                        document.Publish(BusinessLogic.User.GetCurrent());
-                                        document.refreshXmlSortOrder();
+                            document.Publish(BusinessLogic.User.GetCurrent());
+                            document.refreshXmlSortOrder();
                             library.UpdateDocumentCache(int.Parse(tmp[i]));
                         }
                     }
-                                // to update the sortorder of the media node in the XML, re-save the node....
+                    // to update the sortorder of the media node in the XML, re-save the node....
                     else if (isMedia)
                     {
-                                    var media = new cms.businesslogic.media.Media(int.Parse(tmp[i]));
-                                    media.sortOrder = i;
-                                    media.Save();
-                                }
-                                else
-                                {
-                                    new cms.businesslogic.CMSNode(int.Parse(tmp[i])).sortOrder = i;
+                        var media = new cms.businesslogic.media.Media(int.Parse(tmp[i]));
+                        media.sortOrder = i;
+                        media.Save();
+                    }
+                    else
+                    {
+                        new cms.businesslogic.CMSNode(int.Parse(tmp[i])).sortOrder = i;
                     }
                 }