Diff comments:
> diff --git a/debian/rules b/debian/rules
> index 933c8e4..aa17316 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -18,7 +18,10 @@ override_dh_auto_install:
>
> override_dh_auto_test:
> make unittest3
> +<<<<<<< debian/rules
Some merge conflicts remain
>
> override_dh_clean:
> dh_clean
> find . -name __pycache__ -exec rm -rf {} +
> +=======
> +>>>>>>> debian/rules
--
https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/409542
Your team curtin developers is requested to review the proposed merge of
~dbungert/curtin:20.1-3 into curtin:focal-maas-2021-10.
--
Mailing list: https://launchpad.net/~curtin-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~curtin-dev
More help : https://help.launchpad.net/ListHelp
