From 0c764e8db0f8bb345a57854feb070f74f7ae0e56 Mon Sep 17 00:00:00 2001
From: Anuraag Agrawal <aanuraag@amazon.co.jp>
Date: Sat, 20 Feb 2021 13:42:41 +0900
Subject: [PATCH] Fix post-merge conflict (#2358)

---
 .../armeria/v1_3/AbstractArmeriaHttpServerTest.groovy        | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/instrumentation/armeria-1.3/testing/src/main/groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.groovy b/instrumentation/armeria-1.3/testing/src/main/groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.groovy
index 61e984e6f0..4a6c84eaee 100644
--- a/instrumentation/armeria-1.3/testing/src/main/groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.groovy
+++ b/instrumentation/armeria-1.3/testing/src/main/groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.groovy
@@ -120,9 +120,4 @@ abstract class AbstractArmeriaHttpServerTest extends HttpServerTest<Server> {
   boolean testPathParam() {
     true
   }
-
-  @Override
-  boolean testExceptionBody() {
-    false
-  }
 }