fix merge

pydantic · Jan 8, 2025 · 94a0634 · 94a0634
1 parent 296730f
commit 94a0634
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tests/test_logfire.py b/tests/test_logfire.py
@@ -37,12 +37,8 @@
 )
 from logfire._internal.formatter import FormattingFailedWarning, InspectArgumentsFailedWarning
 from logfire._internal.main import NoopSpan
-<<<<<<< HEAD
 from logfire._internal.tracer import record_exception
-from logfire._internal.utils import is_instrumentation_suppressed
-=======
 from logfire._internal.utils import SeededRandomIdGenerator, is_instrumentation_suppressed
->>>>>>> 2327918 (fix)
 from logfire.integrations.logging import LogfireLoggingHandler
 from logfire.testing import TestExporter
 from tests.test_metrics import get_collected_metrics