Suggestion about fixing the conflict in the cli.xq:

- bzr revert cli.xq
- bzr merge lp:zorba & bzr commit
- remove the line with fn:unparsed-text-lines-xxx failing test
- bzr commit
- bzr push
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1073175/+merge/144762
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to