Fix merge errors

--HG-- branch : dev
2025-10-15 03:25:23 +08:00 · 2010-12-11 14:21:49 -08:00
parent f69c47b544
commit 94192a667b
2 changed files with 1 additions and 1 deletions
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
@@ -97,4 +97,3 @@ namespace Orchard.Blogs.Controllers {
        }
    }
 }
-}
--- a/src/Orchard/Environment/IHostEnvironment.cs
+++ b/src/Orchard/Environment/IHostEnvironment.cs
@@ -10,3 +10,4 @@

        void RestartAppDomain();
    }
+}