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/UserStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/UserStep.cs
@@ -8,7 +8,7 @@ using Umbraco.Web.Install.Models;
 namespace Umbraco.Web.Install.InstallSteps
 {

-    [InstallSetupStep("User", "user", 4)]
+    [InstallSetupStep("User", "user", 4, "Saving your user credentials")]
    internal class UserStep : InstallSetupStep<UserModel>
    {
        private readonly ApplicationContext _applicationContext;