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.
« Back to merge proposal
Conflicts again!
Text conflict in lib/canonical/ launchpad/ mail/handlers. py bugs/tests/ bugs-emailinter face.txt services/ mail/tests/ test_incoming. py
Text conflict in lib/lp/
Text conflict in lib/lp/
I can't run the tests on ec2 until they are fixed. Sorry.