polish: resolving the unwanted messages in merge conflicts.

vasantteja · vasantteja · commit 3bbaa076e3cf · 2025-09-25T18:53:35.000-04:00
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt
@@ -1,6 +1,2 @@
-<<<<<<< Updated upstream
 Comparing source compatibility of opentelemetry-instrumentation-api-2.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.20.1.jar
-=======
-Comparing source compatibility of opentelemetry-instrumentation-api-2.20.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.20.0.jar
->>>>>>> Stashed changes
 No changes.
