Fixed some merging issues.

This commit is contained in:
Shannon
2013-06-20 15:57:23 +10:00
parent 24a76f53b4
commit 3618722574
4 changed files with 130 additions and 38 deletions

View File

@@ -6,6 +6,7 @@ using System.Text;
using System.Xml;
using System.Xml.XPath;
using Umbraco.Core.Logging;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Xml;
using Umbraco.Web.Routing;