From 671c8715b0fb225117a5a7724d1014c12871b3aa Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 19 Apr 2013 10:18:46 -0200
Subject: [PATCH] Fix merge issue

---
 src/Umbraco.Web/WebServices/SaveFileController.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/WebServices/SaveFileController.cs b/src/Umbraco.Web/WebServices/SaveFileController.cs
index 25f7173d28..39c7baa4e6 100644
--- a/src/Umbraco.Web/WebServices/SaveFileController.cs
+++ b/src/Umbraco.Web/WebServices/SaveFileController.cs
@@ -1,16 +1,13 @@
 using System;
-using System.IO;
 using System.Linq;
+using System.Text;
 using System.Web.Mvc;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Web.Cache;
 using Umbraco.Web.Macros;
 using Umbraco.Web.Mvc;
 using umbraco;
-using umbraco.BasePages;
 using umbraco.cms.businesslogic.macro;
-using umbraco.presentation.cache;
 using Umbraco.Core;
 using Template = umbraco.cms.businesslogic.template.Template;