Conflicts again! Text conflict in lib/canonical/launchpad/mail/handlers.py Text conflict in lib/lp/bugs/tests/bugs-emailinterface.txt Text conflict in lib/lp/services/mail/tests/test_incoming.py
I can't run the tests on ec2 until they are fixed. Sorry. -- https://code.launchpad.net/~mbp/launchpad/dkim/+merge/35985 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~mbp/launchpad/dkim 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
