From f0d6926e1e06cb7841aec1b75e3d6816d9acade0 Mon Sep 17 00:00:00 2001
From: Vladislav Baranovskiy <vladislav.baranovskiy@webpros.com>
Date: Wed, 8 May 2024 19:03:11 +0700
Subject: [PATCH] Fix akamai-purger-queue-drain-config.json

---
 test/integration/testdata/akamai-purger-queue-drain-config.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/integration/testdata/akamai-purger-queue-drain-config.json b/test/integration/testdata/akamai-purger-queue-drain-config.json
index 1e0464b569f..d79032118db 100644
--- 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,