polish: resolving merge conflicts.

vasantteja · vasantteja · commit df9b9a146ed7 · 2025-09-25T18:52:22.000-04:00
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt
@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.20.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.20.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.20.1.jar
 No changes.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.20.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.20.0.jar`
	`1`	`+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.20.1.jar`
`2`	`2`	`No changes.`