← Back to team overview

wordpress-charmers team mailing list archive

Thread
Date

Re: [Merge] ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:typo-fix into charm-k8s-wordpress:master

To: Tom Haddon <tom.haddon@xxxxxxxxxxxxx>
From: Canonical IS Mergebot <canonical-is-mergebot@xxxxxxxxxxxxx>
Date: Mon, 18 May 2020 10:34:56 -0000
In-reply-to: <158920461469.2037.16428845810970930035.launchpad@ackee.canonical.com>
Reply-to: mp+383718@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Failed to merge change (unable to merge source repository due to conflicts), setting status to needs review.
-- 
https://code.launchpad.net/~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/383718
Your team Wordpress Charmers is requested to review the proposed merge of ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:typo-fix into charm-k8s-wordpress:master.

References

[Merge] ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:typo-fix into charm-k8s-wordpress:master
From: Tom Haddon, 2020-05-11