Re: [xdi-editors] fixed merge conflicts

[Joseph Boyle <planetwork@josephboyle.net>]

I’ve changed XdiOneSpecs to point to wd03, the version I’m working on. Chrome display is not working for several specs now, although Firefox and Safari are. Not yet sure if this is due to any change on the tree on the server.

On Dec 10, 2014, at 3:19 PM, Markus Sabadello <markus.sabadello@xdi.org> wrote:

xdi-core-1.0-wd02.xml has been broken now for more than two months because of a Github merge conflict that wasn't properly resolved. This is bad, since the TC's front page links to it. I just fixed that.

xdi-cryptographic-profiles-1.0-wd01.xml has been broken as well for the same reason. I resolved this merge conflict too, but there seems to be another error:

XML Parsing Error: prefix not bound to a namespace
Location: http://localhost/xdi-spec-docbook/xdi/xdi-cryptographic-profiles-1.0/xdi-cryptographic-profiles-1.0-wd01.xml
Line Number 325, Column 7:

Not sure Peter if you have time to take a look at that.

Markus