From 63cae70ec3cc7bbf827ed090b18eef7d299bfae4 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Tue, 9 Apr 2013 08:05:31 +0600
Subject: [PATCH] Fixes merge issue

---
 .../umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5d3e8e4c14..0ef604cb63 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
@@ -103,7 +103,7 @@ namespace umbraco.presentation.webservices
                         // refresh the xml for the sorting to work
                         if (published)
                         {
-                                        document.SaveAndPublish(Umbraco.Web.UmbracoContext.Current.UmbracoUser);
+                            document.SaveAndPublish(global::Umbraco.Web.UmbracoContext.Current.UmbracoUser);
                             document.refreshXmlSortOrder();
                         }
                     }