fix inline doc

Author: reyang

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.