Fix merge errors

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2011-02-19 19:14:17 -08:00
parent 4883ffa5c9
commit 6b88f4f859
@@ -6,7 +6,7 @@ using Orchard.Environment.Descriptor.Models;
using Orchard.Environment.Extensions; using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Models; using Orchard.Environment.Extensions.Models;
using Orchard.Themes.Services; using Orchard.Themes.Services;
using Orchard.Themes.ViewModels; using Orchard.Themes.Models;
namespace Orchard.Themes.Commands { namespace Orchard.Themes.Commands {
public class ThemeCommands : DefaultOrchardCommandHandler { public class ThemeCommands : DefaultOrchardCommandHandler {