Fix merge conflict issues

canonical · Aug 28, 2023 · 158ced4 · 158ced4
1 parent efbdf4d
commit 158ced4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/internals/cli/cmd_notify.go b/internals/cli/cmd_notify.go
@@ -31,7 +31,8 @@ data fields.
 `
 
 type cmdNotify struct {
-	clientMixin
+	client *client.Client
+
 	RepeatAfter time.Duration `long:"repeat-after"`
 	Positional  struct {
 		Key  string   `positional-arg-name:"<key>" required:"1"`
@@ -47,7 +48,9 @@ func init() {
 		ArgsHelp: map[string]string{
 			"--repeat-after": "If set, allow the notice to repeat after this duration",
 		},
-		Builder: func() flags.Commander { return &cmdNotify{} },
+		New: func(opts *CmdOptions) flags.Commander {
+			return &cmdNotify{client: opts.Client}
+		},
 	})
 }