> LGTM! Although I think there might be a merge conflict with this, just make
> sure you merge the latest version of main into your branch before we approve
> this

Technically launchpad should display if there are any conflicts? In any case, I 
just did a rebase and there were none.
-- 
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441671
Your team MAAS Committers is requested to review the proposed merge of 
~petermakowski/maas-site-manager:update-timezone-MAASENG-1592 into 
maas-site-manager:main.


-- 
Mailing list: https://launchpad.net/~sts-sponsors
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~sts-sponsors
More help   : https://help.launchpad.net/ListHelp

Reply via email to