rebase

linode · Jan 23, 2024 · 2c7da29 · 2c7da29
1 parent c844188
commit 2c7da29
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/cloud/linode/client.go b/cloud/linode/client.go
@@ -34,13 +34,6 @@ type Client interface {
 	DeleteFirewall(ctx context.Context, fwid int) error
 	GetFirewall(context.Context, int) (*linodego.Firewall, error)
 	UpdateFirewallRules(context.Context, int, linodego.FirewallRuleSet) (*linodego.FirewallRuleSet, error)
-<<<<<<< HEAD
-=======
-	DeleteFirewall(context.Context, int) error
-	ListNodeBalancerFirewalls(ctx context.Context, nodebalancerID int, opts *linodego.ListOptions) ([]linodego.Firewall, error)
-	DeleteFirewallDevice(ctx context.Context, firewallID, deviceID int) error
-	ListFirewallDevices(ctx context.Context, firewallID int, opts *linodego.ListOptions) ([]linodego.FirewallDevice, error)
->>>>>>> dadcd59 (fixups + test code from other branch)
 }
 
 // linodego.Client implements Client