← Back to team overview

zorba-coders team mailing list archive

  1. zorba-coders team
  2. Mailing list archive
  3. Message #17437

Re: [Merge] lp:~zorba-coders/zorba/bug1073175 into lp:zorba

  Thread Previous • Date Previous • • Thread Next 
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.

References

  Thread Previous • Date Previous • • Thread Next