From 42c6533e1680dc212380a89da3cfa528b78cbda9 Mon Sep 17 00:00:00 2001
From: Morten Christensen <mc@sitereactor.dk>
Date: Fri, 28 Jun 2013 13:33:41 +0200
Subject: [PATCH] Correcting merge issues

---
 .../Services/ContentTypeServiceTests.cs       | 59 +++++++++++--------
 .../businesslogic/member/Member.cs            |  1 -
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
index 87c490f7fc..0773b968f7 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
@@ -158,33 +158,46 @@ namespace Umbraco.Tests.Services
 			}
 		}
 
-        [Test]
-        public void Can_Save_ContentType_Structure_And_Create_Content_Based_On_It()
-        {
-            // Arrange
-            var cs = ServiceContext.ContentService;
-            var cts = ServiceContext.ContentTypeService;
-            var dtdYesNo = ServiceContext.DataTypeService.GetDataTypeDefinitionById(-49);
-            var ctBase = new ContentType(-1) { Name = "Base", Alias = "Base", Icon = "folder.gif", Thumbnail = "folder.png" };
-            ctBase.AddPropertyType(new PropertyType(dtdYesNo) { Name = "Hide From Navigation", Alias = Constants.Conventions.Content.NaviHide } /*,"Navigation"*/ );
-            cts.Save(ctBase);
+	    [Test]
+	    public void Can_Save_ContentType_Structure_And_Create_Content_Based_On_It()
+	    {
+	        // Arrange
+	        var cs = ServiceContext.ContentService;
+	        var cts = ServiceContext.ContentTypeService;
+	        var dtdYesNo = ServiceContext.DataTypeService.GetDataTypeDefinitionById(-49);
+	        var ctBase = new ContentType(-1) {Name = "Base", Alias = "Base", Icon = "folder.gif", Thumbnail = "folder.png"};
+	        ctBase.AddPropertyType(new PropertyType(dtdYesNo)
+	                                   {
+	                                       Name = "Hide From Navigation",
+	                                       Alias = Constants.Conventions.Content.NaviHide
+	                                   }
+	            /*,"Navigation"*/);
+	        cts.Save(ctBase);
 
-            var ctHomePage = new ContentType(ctBase) { Name = "Home Page", Alias = "HomePage", Icon = "settingDomain.gif", Thumbnail = "folder.png", AllowedAsRoot = true };
-            ctHomePage.AddPropertyType(new PropertyType(dtdYesNo) { Name = "Some property", Alias = "someProperty" }  /*,"Navigation"*/ );
-            cts.Save(ctHomePage);
+	        var ctHomePage = new ContentType(ctBase)
+	                             {
+	                                 Name = "Home Page",
+	                                 Alias = "HomePage",
+	                                 Icon = "settingDomain.gif",
+	                                 Thumbnail = "folder.png",
+	                                 AllowedAsRoot = true
+	                             };
+	        ctHomePage.AddPropertyType(new PropertyType(dtdYesNo) {Name = "Some property", Alias = "someProperty"}
+	            /*,"Navigation"*/);
+	        cts.Save(ctHomePage);
 
-            // Act
-            var homeDoc = cs.CreateContent("Home Page", -1, "HomePage");
-            cs.SaveAndPublish(homeDoc);
+	        // Act
+	        var homeDoc = cs.CreateContent("Home Page", -1, "HomePage");
+	        cs.SaveAndPublish(homeDoc);
 
-            // Assert
-            Assert.That(ctBase.HasIdentity, Is.True);
-            Assert.That(ctHomePage.HasIdentity, Is.True);
-            Assert.That(homeDoc.HasIdentity, Is.True);
-            Assert.That(homeDoc.ContentTypeId, Is.EqualTo(ctHomePage.Id));
-            Assert.That(addedContentType, Is.False);//False because its already added via the ContentType ctor
+	        // Assert
+	        Assert.That(ctBase.HasIdentity, Is.True);
+	        Assert.That(ctHomePage.HasIdentity, Is.True);
+	        Assert.That(homeDoc.HasIdentity, Is.True);
+	        Assert.That(homeDoc.ContentTypeId, Is.EqualTo(ctHomePage.Id));
+	    }
 
-        [Test]
+	    [Test]
         public void Can_Create_And_Save_ContentType_Composition()
         {
             /*
diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs
index 4e2fa3e7c6..dd78840be4 100644
--- a/src/umbraco.cms/businesslogic/member/Member.cs
+++ b/src/umbraco.cms/businesslogic/member/Member.cs
@@ -632,7 +632,6 @@ namespace umbraco.cms.businesslogic.member
                                     poco.Integer = property.Value != null && string.IsNullOrEmpty(property.Value.ToString())
                                           ? 0
                                           : Convert.ToInt32(property.Value);
-                                                       : Convert.ToInt32(property.Value);
                                 }
                                 else
                                 {