[Merge] lp:~mathieu-tl/ofono/conflicts into lp:~phablet-team/ofono/ubuntu

[Mathieu Trudel-Lapierre]

Mathieu Trudel-Lapierre has proposed merging lp:~mathieu-tl/ofono/conflicts into lp:~phablet-team/ofono/ubuntu.

Requested reviews:
  Ubuntu Phablet Team (phablet-team)

For more details, see:
https://code.launchpad.net/~mathieu-tl/ofono/conflicts/+merge/221366

Drop the conflicts for modemmaanger
-- 
https://code.launchpad.net/~mathieu-tl/ofono/conflicts/+merge/221366
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~mathieu-tl/ofono/conflicts into lp:~phablet-team/ofono/ubuntu.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 849 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140529/9c562745/attachment.diff>