Attempt to merge into lp:pantheon-mail failed due to conflicts:
text conflict in po/extra/extra.pot text conflict in po/pantheon-mail.pot
« Back to merge proposal
Attempt to merge into lp:pantheon-mail failed due to conflicts:
text conflict in po/extra/extra.pot mail.pot
text conflict in po/pantheon-