On 17/02/15 13:52, Mathieu Trudel-Lapierre wrote:
> Review: Resubmit
>
> Looks like you've set this merge against the wrong branch, this is why you have so many conflicts. You'll want to resubmit this for lp:~ubuntu-core-dev/grub-installer/ubuntu.
>
OK, thanks to 'dobey' I believe I've got it sorted.
On 17/02/15 13:52, Mathieu Trudel-Lapierre wrote:
> Review: Resubmit
>
> Looks like you've set this merge against the wrong branch, this is why you have so many conflicts. You'll want to resubmit this for lp:~ubuntu-core-dev/grub-installer/ubuntu.
>
OK, thanks to 'dobey' I believe I've got it sorted.
https:/ /code.launchpad .net/~tj/ grub-installer/ lp1354730/ +merge/ 250056