minor merge fixes

This commit is contained in:
Shannon
2018-07-31 15:12:49 +10:00
parent d073e727cb
commit ecc83595c8

View File

@@ -5,6 +5,7 @@ using System.Web;
using System.Web.UI.WebControls;
using ClientDependency.Core;
using Umbraco.Core;
using Umbraco.Web;
using Umbraco.Web.UI;
using Umbraco.Web._Legacy.UI;
using UmbracoUserControl = Umbraco.Web.UI.Controls.UmbracoUserControl;