remove accidental conflict lines

briiians · briiians · commit 8753c8d5c5d6 · 2025-12-16T16:11:12.000-08:00
diff --git a/varnish-cache/test/unit/deployment.bats b/varnish-cache/test/unit/deployment.bats
@@ -102,8 +102,6 @@ rollingUpdate:
 
     [[ "${actual}" == *"'server.extraVolumeClaimTemplates' cannot be enabled"* ]]
 }
-<<<<<<< HEAD
-=======
 
 @test "Service/externalTrafficPolicy: defaults to Cluster" {
     cd "$(chart_dir)"
@@ -137,4 +135,3 @@ rollingUpdate:
 
     [ "${actual}" == "Local" ]
 }
->>>>>>> f19dc40 (added unit tests for the varnish cache helm charts too)

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,6 @@ rollingUpdate:`
`102`	`102`
`103`	`103`	`[[ "${actual}" == "'server.extraVolumeClaimTemplates' cannot be enabled" ]]`
`104`	`104`	`}`
`105`		`-<<<<<<< HEAD`
`106`		`-=======`
`107`	`105`
`108`	`106`	`@test "Service/externalTrafficPolicy: defaults to Cluster" {`
`109`	`107`	`cd "$(chart_dir)"`
`@@ -137,4 +135,3 @@ rollingUpdate:`
`137`	`135`
`138`	`136`	`[ "${actual}" == "Local" ]`
`139`	`137`	`}`
`140`		`->>>>>>> f19dc40 (added unit tests for the varnish cache helm charts too)`