From 96d88f56a353b1c366ca7c00e0c76d4e3bba5f4a Mon Sep 17 00:00:00 2001
From: Anuraag Agrawal <aanuraag@amazon.co.jp>
Date: Fri, 18 Jun 2021 10:04:53 +0900
Subject: [PATCH] Fix merge conflict.

---
 .../javaagent/spring-rabbit-1.0-javaagent.gradle              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/spring-rabbit-1.0-javaagent.gradle b/instrumentation/spring/spring-rabbit-1.0/javaagent/spring-rabbit-1.0-javaagent.gradle
index 625144efb4bc..a9aeeb2df426 100644
--- a/instrumentation/spring/spring-rabbit-1.0/javaagent/spring-rabbit-1.0-javaagent.gradle
+++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/spring-rabbit-1.0-javaagent.gradle
@@ -1,4 +1,6 @@
-apply from: "$rootDir/gradle/instrumentation.gradle"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {