fixed merge issues

2014-03-04 11:42:11 +11:00
parent 000b2b639f
commit 0497771750
11 changed files with 12 additions and 12 deletions
--- a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
@@ -7,7 +7,7 @@ using Umbraco.Web.Install.Models;

 namespace Umbraco.Web.Install.InstallSteps
 {
-    [InstallSetupStep("StarterKitInstall", 7)]
+    [InstallSetupStep("StarterKitInstall", 7, "Installing a starter website to help you get off to a great start")]
    internal class StarterKitInstallStep : InstallSetupStep<object>
    {
        private readonly InstallStatusType _status;