Code review comment for lp:~kissiel/checkbox/migrate-from-make

> Attempt to merge into lp:checkbox failed due to conflicts:
>
> duplicate in plainbox/plainbox/impl/providers/exporters/data/global.txt.moved

Weird. Rebased on current trunk.
Trying to land...