Skip to content

Commit

Permalink
missed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Jared Edwards committed Oct 22, 2023
1 parent 6401329 commit 3938c25
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions internal/controller/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,9 @@ func (clctrl *ClusterController) StateStoreCredentials() error {
}

var stateStoreData pkgtypes.StateStoreCredentials
<<<<<<< HEAD
telemetry.SendEvent(clctrl.SegmentClient, telemetry.StateStoreCredentialsCreateStarted, "")
=======
segClient := segment.InitClient()
defer segClient.Client.Close()
telemetry.SendEvent(segClient, telemetry.StateStoreCredentialsCreateStarted, "")
>>>>>>> eeb0e87e1ac5c48d1a7c29dda4c700b382811a7c

if !cl.StateStoreCredsCheck {
switch clctrl.CloudProvider {
Expand Down

0 comments on commit 3938c25

Please sign in to comment.