No need to change order of imports (bad conflict resolution)

This commit is contained in:
Eric Eastwood
2025-10-02 11:33:34 -05:00
parent c92f905267
commit 52d88ac369

View File

@@ -42,6 +42,11 @@ from synapse.util.clock import Clock
from tests.server import get_clock
try:
import jaeger_client
except ImportError:
jaeger_client = None # type: ignore
try:
import opentracing
@@ -50,11 +55,6 @@ except ImportError:
opentracing = None # type: ignore
LogContextScopeManager = None # type: ignore
try:
import jaeger_client
except ImportError:
jaeger_client = None # type: ignore
import logging