From 85bd88439ec73214d733352354f2268efe5df0c7 Mon Sep 17 00:00:00 2001 From: Kelvin Liu Date: Wed, 4 Dec 2024 16:12:58 +1100 Subject: [PATCH] fix: resolve merge conflicts; --- apiserver/facades/client/client/statuslegacy_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apiserver/facades/client/client/statuslegacy_test.go b/apiserver/facades/client/client/statuslegacy_test.go index a5695892142..57039341614 100644 --- a/apiserver/facades/client/client/statuslegacy_test.go +++ b/apiserver/facades/client/client/statuslegacy_test.go @@ -952,8 +952,9 @@ func (s *statusUpgradeUnitSuite) AddApplication(c *gc.C, charmName, applicationN st := s.ControllerModel(c).State() _, err := st.AddApplication(state.AddApplicationArgs{ - Name: applicationName, - Charm: ch, + Name: applicationName, + Charm: ch, + CharmURL: ch.URL(), CharmOrigin: &state.CharmOrigin{ ID: "mycharmhubid", Hash: "mycharmhash",