fix inline doc

open-telemetry · Sep 20, 2019 · 035983a · 035983a
1 parent b43b26a
commit 035983a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py
@@ -79,12 +79,8 @@ def shutdown(self) -> None:
 
 
 class ConsoleSpanExporter(SpanExporter):
-<<<<<<< HEAD
     """Implementation of :class:`SpanExporter` that prints spans to the
     console.
-=======
-    """Implementation of :class:`Exporter` that prints spans to the console.
->>>>>>> add console exporter
 
     This class can be used for diagnostic purposes. It prints the exported
     spans to the console STDOUT.