fixed merge issues

This commit is contained in:
Shannon
2014-03-04 11:42:11 +11:00
parent 000b2b639f
commit 0497771750
11 changed files with 12 additions and 12 deletions

View File

@@ -4,7 +4,7 @@ namespace Umbraco.Web.Install.Models
{
public sealed class InstallSetupStepAttribute : Attribute
{
public InstallSetupStepAttribute(string name, string view, int serverOrder)
public InstallSetupStepAttribute(string name, string view, int serverOrder, string description)
{
Name = name;
View = view;
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Install.Models
Description = description;
}
public InstallSetupStepAttribute(string name, int serverOrder)
public InstallSetupStepAttribute(string name, int serverOrder, string description)
{
Name = name;
View = string.Empty;