From 701b42ca2b0e7823d2ac03849ca4caef7593fa8d Mon Sep 17 00:00:00 2001
From: Christian Huffman <chuffman@redhat.com>
Date: Thu, 12 Nov 2020 16:45:26 -0500
Subject: [PATCH] Corrected CSIDriver validation rebase issues

---
 pkg/apis/storage/validation/validation_test.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkg/apis/storage/validation/validation_test.go b/pkg/apis/storage/validation/validation_test.go
index 8e692f04973..c0e80641422 100644
--- a/pkg/apis/storage/validation/validation_test.go
+++ b/pkg/apis/storage/validation/validation_test.go
@@ -1869,16 +1869,10 @@ func TestCSIDriverValidationUpdate(t *testing.T) {
 	attachNotRequired := false
 	podInfoOnMount := true
 	notPodInfoOnMount := false
-<<<<<<< HEAD
 	notRequiresRepublish := false
-=======
 	resourceVersion := "1"
-<<<<<<< HEAD
->>>>>>> Relax validation for CSIVolumeFSGroupPolicy
-=======
 	invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy
 	invalidFSGroupPolicy = "invalid-mode"
->>>>>>> Move CSIVolumeFSGroupPolicy to beta
 	old := storage.CSIDriver{
 		ObjectMeta: metav1.ObjectMeta{Name: driverName, ResourceVersion: resourceVersion},
 		Spec: storage.CSIDriverSpec{