On Fri, 16 Jan 2009 12:54:23 -0800 (PST) Jesse Aldridge <[email protected]> wrote:
> Here's the first ten lines of leoSettings.leo: > ------------------- > <?xml version="1.0" encoding="utf-8"?> > <?xml-stylesheet ekr_test?> > <leo_file> > <leo_header file_format="2" tnodes="0" max_tnode_index="0" > clone_windows="0"/> > <globals body_outline_ratio="0.5"> > <<<<<<< TREE bzr merge is running into conflicts it can't resolve and marking them for you with '<<<<<<<<' and '>>>>>>>' markers which is creating invalid XML, you have to manually resolve the conflicts before you can continue. See `bzr help conflicts` Cheers -Terry --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en -~----------~----~----~----~------~----~------~--~---
