Fix conflict

comet-ml · Jan 14, 2025 · f7c84d7 · f7c84d7
1 parent 4ffa8d1
commit f7c84d7
Showing 1 changed file with 0 additions and 6 deletions.
diff --git 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