resolved merge conflict

6f4f9e1c · lintangsutawika · 0d5748b7 · aed90773 · 6f4f9e1c · 6f4f9e1c
Commit 6f4f9e1c authored Dec 13, 2023 by lintangsutawika
20 changed files
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_04/b.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_04/b.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_04/c.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_04/c.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_05/a.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_05/a.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_05/b.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_05/b.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_05/c.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_05/c.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_06/a.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_06/a.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_06/b.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_06/b.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_06/c.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_06/c.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_07/a.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_07/a.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_07/b.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_07/b.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_07/c.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_07/c.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_08/a.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_08/a.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_08/b.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_08/b.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/output_variation/style_08/c.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/output_variation/style_08/c.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/prompt_variation/style_02.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/prompt_variation/style_02.yaml
--- a/lm_eval/tasks/arc/alternative_worlds/prompt_variation/style_03.yaml
+++ b/lm_eval/tasks/arc/alternative_worlds/prompt_variation/style_03.yaml
--- a/lm_eval/tasks/bbh/alternative_worlds/README.md
+++ b/lm_eval/tasks/bbh/alternative_worlds/README.md
--- a/lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/_zeroshot_template_yaml
+++ b/lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/_zeroshot_template_yaml
--- a/lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/formal_fallacies.yaml
+++ b/lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/formal_fallacies.yaml
--- a/lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/movie_recommendation.yaml
+++ b/lm_eval/tasks/bbh/alternative_worlds/prompt_variation/style_01/zeroshot/movie_recommendation.yaml