[Merge] lp:~renatofilho/buteo-sync-plugins-contacts/solve-eds-conflict into lp:buteo-sync-plugins-contacts

[Sebastien Bacher]

The proposal to merge lp:~renatofilho/buteo-sync-plugins-contacts/solve-eds-conflict into lp:buteo-sync-plugins-contacts has been updated.

    Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~renatofilho/buteo-sync-plugins-contacts/solve-eds-conflict/+merge/302071
-- 
Your team Ubuntu Phablet Team is subscribed to branch lp:buteo-sync-plugins-contacts.