Fix merge inconsistency

plesk · Feb 15, 2024 · ccdb2d1 · ccdb2d1
1 parent a07b600
commit ccdb2d1
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/test/integration/testdata/akamai-purger-queue-drain-config.json b/test/integration/testdata/akamai-purger-queue-drain-config.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"akamaiPurger": {
 		"debugAddr": ":9766",
 		"purgeRetries": 10,