Resolved Merge Conflicts

Author: Raghul-M

support/environment_test.go

@@ -63,8 +63,6 @@ func TestGetPyTorchImage(t *testing.T) {
 	}
 }
 
-<<<<<<< HEAD
-
 func TestGetClusterID(t *testing.T) {
 	os.Setenv(ClusterID, "my-cluster-id")
 	clusterId, ok := GetClusterId()
@@ -120,11 +118,6 @@ func TestGetClusterType(t *testing.T) {
 			envVarValue: "KIND",
 			expected:    KindCluster,
 		},
-<<<<<<< HEAD
-
-=======
-		
->>>>>>> b7de4530b50b2f66481ecfff5ef13f6de6cd3228
 	}
 	ttt := With(t)
 	for _, tt := range tests {

support/machine_test.go

@@ -44,8 +44,6 @@ func TestGetMachineSets(t *testing.T) {
 
 }
 
-
-
 /*
 import (
 
@@ -166,5 +164,3 @@ func TestGetMachines(t *testing.T) {
 	})
 }
 */
-
-

support/ocm_test.go

@@ -33,4 +33,3 @@ func TestGetMachinePools(t *testing.T) {
 }
 
 */
-