docs: remove merge conflict garbage
authorBrian Paul <brianp@vmware.com>
Sat, 6 Mar 2010 00:32:07 +0000 (17:32 -0700)
committerBrian Paul <brianp@vmware.com>
Sat, 6 Mar 2010 00:32:07 +0000 (17:32 -0700)
commitc781e2841a25aeecac2f9af1a31ce129a530d796
tree2a87d7af0b9552075fae8c4c369a049dfbc53a20
parent77fc3ef9116fae6b8b53cda78d97c4ff1ec5c171
docs: remove merge conflict garbage
docs/relnotes.html