I created a fresh merge proposal from a new branch. It does not show the conflicts.
https://code.launchpad.net/~mgerdts/cloud-init/+git/cloud-init/+merge/374989
« Back to merge proposal
I created a fresh merge proposal from a new branch. It does not show the conflicts.
https:/ /code.launchpad .net/~mgerdts/ cloud-init/ +git/cloud- init/+merge/ 374989