Fixed formatting on IsLogicalOneToOne property.

Author: mickfold

src/NHibernate/Mapping/ManyToOne.cs

@@ -38,8 +38,7 @@ public bool IsIgnoreNotFound
 
 		public bool IsLogicalOneToOne
 		{
-			get
-			{ return isLogicalOneToOne; }
+			get { return isLogicalOneToOne; }
 			set { isLogicalOneToOne = value; }
 		}
 

src/NHibernate/Mapping/ManyToOne.cs.orig

@@ -29,13 +29,21 @@ namespace NHibernate.Mapping
 		}
 
 		private bool isIgnoreNotFound = false;
+		private bool isLogicalOneToOne;
 
 		public bool IsIgnoreNotFound
 		{
 			get { return isIgnoreNotFound; }
 			set { isIgnoreNotFound = value; }
 		}
 
+		public bool IsLogicalOneToOne
+		{
+			get
+			{ return isLogicalOneToOne; }
+			set { isLogicalOneToOne = value; }
+		}
+
 		private IType type;
 		public override IType Type
 		{
@@ -44,7 +52,7 @@ namespace NHibernate.Mapping
 				if (type == null)
 				{
 					type =
-						TypeFactory.ManyToOne(ReferencedEntityName, ReferencedPropertyName, IsLazy, UnwrapProxy, Embedded, IsIgnoreNotFound);
+						TypeFactory.ManyToOne(ReferencedEntityName, ReferencedPropertyName, IsLazy, UnwrapProxy, Embedded, IsIgnoreNotFound, isLogicalOneToOne);
 				}
 				return type;
 			}
@@ -127,8 +135,7 @@ namespace NHibernate.Mapping
 
 		public bool IsLogicalOneToOne
 		{
-			get
-			{ return isLogicalOneToOne; }
+			get { return isLogicalOneToOne; }
 			set { isLogicalOneToOne = value; }
 		}
 
@@ -182,5 +189,5 @@ namespace NHibernate.Mapping
 			}
 		}
 	}
->>>>>>> For NH-1262: Ported cascade delete orphans functionality for one-to-one mappings from Hibernate to NHibernate.
+>>>>>>> Fixed formatting on IsLogicalOneToOne property.
 }