Missed HEAD during rebase

microsoft · Jun 16, 2023 · 865a994 · 865a994
1 parent 33f31dc
commit 865a994
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/...azure/monitor/opentelemetry/_vendor/v0_39b0/opentelemetry/instrumentation/instrumentor.py b/...azure/monitor/opentelemetry/_vendor/v0_39b0/opentelemetry/instrumentation/instrumentor.py
@@ -21,15 +21,7 @@
 from logging import getLogger
 from typing import Collection, Optional
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.dependencies import (
-=======
-from opentelemetry.instrumentation.dependencies import (
->>>>>>> e5ea90e (copied 0.39b0)
-=======
-from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.dependencies import (
->>>>>>> 07fbaed (Import module replacement. Checks pass)
  DependencyConflict,
  get_dependency_conflicts,
 )