From 23c6a91e9cad6d4a6ca164cbdb98ca74ec7e579a Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 19 Aug 2013 11:47:53 +0200
Subject: [PATCH] Fixes merge issue

---
 src/Umbraco.Web/Mvc/UmbracoViewPage.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPage.cs b/src/Umbraco.Web/Mvc/UmbracoViewPage.cs
index 2ba6faff13..fa22cf419b 100644
--- a/src/Umbraco.Web/Mvc/UmbracoViewPage.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoViewPage.cs
@@ -1,5 +1,5 @@
 using System;
-using Sytem.Text;
+using System.Text;
 using System.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;