Typo in merge conflict resolution
MODIFY
dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java
dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java
@@ -71,7 +71,7 @@ public final class JaxRsAnnotationsInstrumentation extends Instrumenter.Default
.or(named("javax.ws.rs.OPTIONS"))
.or(named("javax.ws.rs.POST"))
.or(named("javax.ws.rs.PUT"))))),
- JaxRsAnnotationsInstrumentation.class.getName() + "$JaxRsAnnotationsAdvice"));
+ JaxRsAnnotationsInstrumentation.class.getName() + "$JaxRsAnnotationsAdvice");
}
public static class JaxRsAnnotationsAdvice {

Typo in merge conflict resolution