move write statuses logic to a separate func

kubernetes · Nov 8, 2020 · 58dbc5c · 58dbc5c
1 parent 4a25d50
commit 58dbc5c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go
@@ -213,11 +213,7 @@ var statusCmd = &cobra.Command{
 }
 
 // writeStatusesAtInterval writes statuses in a given output format - at intervals defined by duration
-<<<<<<< HEAD
 func writeStatusesAtInterval(duration time.Duration, api libmachine.API, cc *config.ClusterConfig) {
-=======
-func writeStatusesAtInterval(duration time.Duration, api libmachine.API, cc *config.ClusterConfig) int {
->>>>>>> ab981fe40 (move write statuses logic to a separate func)
 	for {
 		var statuses []*Status