From 94192a667b17f4720f03271649b40099b138bcae Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Sat, 11 Dec 2010 14:21:49 -0800
Subject: [PATCH] Fix merge errors

--HG--
branch : dev
---
 .../Modules/Orchard.Blogs/Controllers/BlogController.cs          | 1 -
 src/Orchard/Environment/IHostEnvironment.cs                      | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
index e9d1e6639..43a78d750 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
@@ -95,6 +95,5 @@ namespace Orchard.Blogs.Controllers {
             // Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
             return View((object)blog);
         }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/Environment/IHostEnvironment.cs b/src/Orchard/Environment/IHostEnvironment.cs
index 7cab1dc3f..563b96475 100644
--- a/src/Orchard/Environment/IHostEnvironment.cs
+++ b/src/Orchard/Environment/IHostEnvironment.cs
@@ -9,4 +9,5 @@
         bool IsAssemblyLoaded(string name);
 
         void RestartAppDomain();
+    }
 }
\ No newline at end of file