Fix issue with merge

mickfold · mickfold · commit a365cf6c6d4a · 2014-11-19T22:17:44.000Z
diff --git a/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs
@@ -241,11 +241,6 @@ private void BindManyToOne(HbmManyToOne manyToOneMapping, ManyToOne model, strin
 				model.IsLogicalOneToOne = true;
 			}
 
-			if (manyToOneMapping.unique)
-			{
-				model.IsLogicalOneToOne = true;
-			}
-
 			BindForeignKey(manyToOneMapping.foreignkey, model);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -241,11 +241,6 @@ private void BindManyToOne(HbmManyToOne manyToOneMapping, ManyToOne model, strin`
`241`	`241`	`model.IsLogicalOneToOne = true;`
`242`	`242`	`}`
`243`	`243`
`244`		`- if (manyToOneMapping.unique)`
`245`		`- {`
`246`		`- model.IsLogicalOneToOne = true;`
`247`		`- }`
`248`		`-`
`249`	`244`	`BindForeignKey(manyToOneMapping.foreignkey, model);`
`250`	`245`	`}`
`251`	`246`