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/SetUmbracoVersionStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
@@ -10,7 +10,7 @@ using GlobalSettings = umbraco.GlobalSettings;

 namespace Umbraco.Web.Install.InstallSteps
 {
-    [InstallSetupStep("UmbracoVersion", 9)]
+    [InstallSetupStep("UmbracoVersion", 9, "Wrapping up the system configuration")]
    internal class SetUmbracoVersionStep : InstallSetupStep<object>
    {
        private readonly ApplicationContext _applicationContext;