Fix merge errors

--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

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.
return View((object)blog);
}
}
}
}

View File

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