Fix import statement in otter.py

Luodian · Nov 6, 2023 · e0b0bb0 · e0b0bb0
1 parent a0c4f71
commit e0b0bb0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pipeline/benchmarks/public_datasets_suite/models/otter.py b/pipeline/benchmarks/public_datasets_suite/models/otter.py
@@ -6,11 +6,7 @@
 
 from pipeline.benchmarks.public_datasets_suite.eval_model import BaseEvalModel
 from contextlib import suppress
-<<<<<<< HEAD:pipeline/benchmarks/public_datasets_suite/models/otter.py
 from pipeline.benchmarks.public_datasets_suite.models.utils import unwrap_model
-=======
-from pipeline.eval.models.utils import unwrap_model
->>>>>>> 0d12192f665f5e9da1ecb2f23d6a360eb7753771:pipeline/eval/models/otter.py
 from otter_ai import OtterForConditionalGeneration
 import os