← Back to team overview

zorba-coders team mailing list archive

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

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

  Thread Previous • Date Previous • • Thread Next 
Unfortunately you've got a ton of merge conflicts here. Can you try merging from the latest trunk onto your branch and push it back to your branch?
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
Your team Zorba Coders is subscribed to branch lp:zorba.

References

  Thread Previous • Date Previous • • Thread Next