fixed merge conflict in: Sending in an empty string as namespaceURI when setting a value to an attribute that does not belong to a namespace, otherwise it will overwrite the value in another attribute with same name but in another namespace if it finds one.

original author: Tobias Gummesson

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs

@@ -371,7 +371,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 				name = PropertyName;
 			}
 
-			element.SetAttribute(name, value);
+			element.SetAttribute(name, string.Empty, value);
 			return element.GetAttributeNode(name);
 		}