From f7c84d7dfcb3ef8d4163c0dcc2af2421a90853ee Mon Sep 17 00:00:00 2001 From: Aliaksandr Kuzmik Date: Tue, 14 Jan 2025 16:16:51 +0100 Subject: [PATCH] Fix conflict --- sdks/python/src/opik/__init__.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sdks/python/src/opik/__init__.py b/sdks/python/src/opik/__init__.py index 70c59e77ad..8582395f42 100644 --- a/sdks/python/src/opik/__init__.py +++ b/sdks/python/src/opik/__init__.py @@ -9,14 +9,8 @@ from .api_objects.span import Span from .api_objects.trace import Trace from .configurator.configure import configure -<<<<<<< HEAD from .decorator.tracker import flush_tracker, track -from .evaluation import evaluate, evaluate_experiment -======= -from . import package_version -from .plugins.pytest.decorator import llm_unit from .evaluation import evaluate, evaluate_experiment, evaluate_prompt ->>>>>>> main from .integrations.sagemaker import auth as sagemaker_auth from .plugins.pytest.decorator import llm_unit