On Wed, Oct 30, 2013 at 4:53 PM, Viktor Ransmayr <[email protected]>wrote:
> Hello Edward, > > When I tried to update to the latest version of Leo I received the > following conflict: > [snip] > Text conflict in leo/doc/LeoDocs.leo Auf 1 Konflikte gestoßen. Now on revision 6202. Presumably you modified LeoDocs.leo. Several ways to recover: - bzr revert - bzr pull --overwrite. If those don't work, you may need to pull a new branch. Edward -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/groups/opt_out.
