resolve merge conflicts

Azure · Oct 14, 2019 · ca07726 · ca07726
2 parents ad786ee + 9de1e78
commit ca07726
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/controllers/resourcegroup_controller_test.go b/controllers/resourcegroup_controller_test.go
@@ -2,16 +2,10 @@ package controllers
 
 import ( 
 	"context"
-<<<<<<< HEAD
 	"fmt"
 	"net/http"
 	"strings"
-
-	azurev1 "github.com/Azure/azure-service-operator/api/v1"
-=======
-
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
->>>>>>> master
 	"github.com/Azure/azure-service-operator/pkg/helpers"
 
 	. "github.com/onsi/ginkgo"