lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix merge errors

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-12-11 14:21:49 -08:00
parent f69c47b544
commit 94192a667b
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
View File

@@ -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. // Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
return View((object)blog); return View((object)blog);
} }
}
} }
} }

1
src/Orchard/Environment/IHostEnvironment.cs
View File

@@ -9,4 +9,5 @@
bool IsAssemblyLoaded(string name); bool IsAssemblyLoaded(string name);
void RestartAppDomain(); void RestartAppDomain();
}
} }