Skip to content

Commit

Permalink
fix: resolve merge conflicts;
Browse files Browse the repository at this point in the history
  • Loading branch information
ycliuhw committed Dec 4, 2024
1 parent c4db56b commit 85bd884
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions apiserver/facades/client/client/statuslegacy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 85bd884

Please sign in to comment.