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

[Renato Araujo Oliveira Filho]

Renato Araujo Oliveira Filho has proposed merging lp:~renatofilho/buteo-sync-plugins-contacts/solve-eds-conflict into lp:buteo-sync-plugins-contacts.

Commit message:
Removed conflicts flag with "evolution-data-server-online-accounts"

This is not necessary anymore files and services has different names now.

Requested reviews:
  Ubuntu Phablet Team (phablet-team)
Related bugs:
  Bug #1609872 in buteo-sync-plugins-contacts (Ubuntu): "buteo-sync-plugins-contacts-google conflicts with evolution-data-server-online-accounts making impossible unity8-desktop to live together with ubuntu-desktop"
  https://bugs.launchpad.net/ubuntu/+source/buteo-sync-plugins-contacts/+bug/1609872

For more details, see:
https://code.launchpad.net/~renatofilho/buteo-sync-plugins-contacts/solve-eds-conflict/+merge/302071
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~renatofilho/buteo-sync-plugins-contacts/solve-eds-conflict into lp:buteo-sync-plugins-contacts.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 460 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20160804/377c4c09/attachment.diff>