Code review comment for lp:~zorba-coders/zorba/bug-1130998

Revision history for this message
Chris Hillery (ceejatec) wrote :

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?

« Back to merge proposal