chore: Fixed further merge mistake

cloudfoundry · Dec 11, 2024 · 69e2f90 · 69e2f90
1 parent ee13ceb
commit 69e2f90
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/acceptance-tests/upgrade/update_and_upgrade_storage_test.go b/acceptance-tests/upgrade/update_and_upgrade_storage_test.go
@@ -3,12 +3,7 @@ package upgrade_test
 import (
 	"csbbrokerpakgcp/acceptance-tests/helpers/apps"
 	"csbbrokerpakgcp/acceptance-tests/helpers/brokers"
-<<<<<<< HEAD
 	"csbbrokerpakgcp/acceptance-tests/helpers/plans"
-||||||| 6fe36f4
-	"csbbrokerpakgcp/acceptance-tests/helpers/cf"
-=======
->>>>>>> main
 	"csbbrokerpakgcp/acceptance-tests/helpers/random"
 	"csbbrokerpakgcp/acceptance-tests/helpers/services"