Fix merge problems

2014-08-04 13:56:51 +02:00
parent dba180d809
commit 5fd59a6450
2 changed files with 8 additions and 3 deletions
--- a/src/umbraco.cms/businesslogic/web/DocumentType.cs
+++ b/src/umbraco.cms/businesslogic/web/DocumentType.cs
@@ -477,7 +477,7 @@ namespace umbraco.cms.businesslogic.web
        public XmlElement ToXml(XmlDocument xd)
        {
            var exporter = new EntityXmlSerializer();
-            var xml = exporter.Serialize(ApplicationContext.Current.Services.DataTypeService, _contentType);
+            var xml = exporter.Serialize(ApplicationContext.Current.Services.DataTypeService, ContentType);

            //convert the Linq to Xml structure to the old .net xml structure
            var xNode = xml.GetXmlNode();