resolved merge conflict

e58b8182 · lintangsutawika · d213a533 · 0571eeb1 · e58b8182 · e58b8182
Commit e58b8182 authored Aug 08, 2024 by lintangsutawika
5 changed files
--- a/lm_eval/tasks/truthfulqa/README.md
+++ b/lm_eval/tasks/truthfulqa/README.md
--- a/lm_eval/utils.py
+++ b/lm_eval/utils.py
--- a/pyproject.toml
+++ b/pyproject.toml
--- a/scripts/model_comparator.py
+++ b/scripts/model_comparator.py
--- a/tests/models/test_api.py
+++ b/tests/models/test_api.py