diff --git a/test/integration/testdata/akamai-purger-queue-drain-config.json b/test/integration/testdata/akamai-purger-queue-drain-config.json index f7e6c9cfd07d..520da76bb677 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,