fixes merge issues

2013-10-02 09:30:53 +10:00
parent 2a1e3dc2f8
commit bad4d0c6e6
2 changed files with 4 additions and 1 deletions
--- a/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs
@@ -16,5 +16,8 @@ namespace Umbraco.Web.Models.ContentEditing
        [DataMember(Name = "email", IsRequired = true)]
        [RequiredForPersistence(AllowEmptyStrings = false, ErrorMessage = "Required")]
        public string Email { get; set; }
+
+        [DataMember(Name = "password", IsRequired = true)]        
+        public string Password { get; set; }
    }
 }