Thread Previous • Date Previous • Date Next • Thread Next |
Have you merged the trunk? That's the more likely cause of merge conflicts. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700 Your team Zorba Coders is subscribed to branch lp:zorba.
Thread Previous • Date Previous • Date Next • Thread Next |