merging r10009 to the trunk

This commit is contained in:
tworrall 2012-08-13 16:14:28 +00:00
parent eae6359a6d
commit cdd10b24f1

View file

@ -10,7 +10,7 @@
<#assign property = editConfiguration.objectPropertyStatementDisplayPropertyModel /> <#assign property = editConfiguration.objectPropertyStatementDisplayPropertyModel />
</#if> </#if>
<#else> <#else>
<#assign statement = editConfiguration.pageData.dataPropertyLexicalValue /> <#assign statement = editConfiguration.dataLiteralValuesAsString />
</#if> </#if>
<#assign deletionTemplateName = editConfiguration.deleteTemplate/> <#assign deletionTemplateName = editConfiguration.deleteTemplate/>