From 969abb5057f996bb9149407c162609bcf7064fff Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 3 Oct 2013 12:53:26 +1000
Subject: [PATCH] Fixes merge issues

---
 .../umbraco.presentation/umbraco/Trees/loadTemplates.cs          | 1 +
 .../umbraco.presentation/umbraco/create/DLRScripting.ascx.cs     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
index b923e8c075..386cc0b3a2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
@@ -9,6 +9,7 @@ using System.Xml;
 using System.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using umbraco.BasePages;
 using umbraco.BusinessLogic;
 using umbraco.businesslogic;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
index 4a67a7cab4..49275e0902 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
@@ -11,6 +11,7 @@ using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Xml.Linq;
 using Umbraco.Core;
+using Umbraco.Core.IO;
 using Umbraco.Web.UI;
 using umbraco.cms.businesslogic.macro;
 using umbraco.scripting;