The conflict in the diff is erroneous AFAIKT. The latest devel has been merged into the first branch in this pipe and pumped all the way down. None of the upstream branches has any conflict in their mp diff. And this branch is fine on my disk. -- https://code.launchpad.net/~wallyworld/launchpad/audit-sharing3-933815/+merge/100147 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wallyworld/launchpad/audit-sharing3-933815 into lp:launchpad.
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
