Hmm that seems to be an artefact of Launchpad - I can't see any conflict locally. -- https://code.launchpad.net/~alexmurray/ubuntu-qa-tools/+git/ubuntu-qa-tools/+merge/461223 Your team Ubuntu Bug Control is subscribed to branch ubuntu-qa-tools:master.
_______________________________________________ Mailing list: https://launchpad.net/~ubuntu-bugcontrol Post to : ubuntu-bugcontrol@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-bugcontrol More help : https://help.launchpad.net/ListHelp
