open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix post-merge conflict (#2358)

This commit is contained in:
Anuraag Agrawal 2021-02-20 13:42:41 +09:00 committed by GitHub
parent 0290761acb
commit 0c764e8db0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
instrumentation/armeria-1.3/testing/src/main/groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.groovy
View File

@ -120,9 +120,4 @@ abstract class AbstractArmeriaHttpServerTest extends HttpServerTest<Server> {
boolean testPathParam() { boolean testPathParam() {
true true
} }
@Override
boolean testExceptionBody() {
false
}
} }