fix conflict for upstream

63001b68 · bzantium · a956bc63 · 84ef60ee · 63001b68 · 63001b68
Commit 63001b68 authored May 23, 2023 by bzantium
20 changed files
--- a/lm_eval/datasets/bigbench_resources/disambiguation_qa.json
+++ b/lm_eval/datasets/bigbench_resources/disambiguation_qa.json
--- a/lm_eval/datasets/bigbench_resources/dyck_languages.json
+++ b/lm_eval/datasets/bigbench_resources/dyck_languages.json
--- a/lm_eval/datasets/bigbench_resources/formal_fallacies_syllogisms_negation.json
+++ b/lm_eval/datasets/bigbench_resources/formal_fallacies_syllogisms_negation.json
--- a/lm_eval/datasets/bigbench_resources/geometric_shapes.json
+++ b/lm_eval/datasets/bigbench_resources/geometric_shapes.json
--- a/lm_eval/datasets/bigbench_resources/hyperbaton.json
+++ b/lm_eval/datasets/bigbench_resources/hyperbaton.json
--- a/lm_eval/datasets/bigbench_resources/logical_deduction_five_objects.json
+++ b/lm_eval/datasets/bigbench_resources/logical_deduction_five_objects.json
--- a/lm_eval/datasets/bigbench_resources/logical_deduction_seven_objects.json
+++ b/lm_eval/datasets/bigbench_resources/logical_deduction_seven_objects.json
--- a/lm_eval/datasets/bigbench_resources/logical_deduction_three_objects.json
+++ b/lm_eval/datasets/bigbench_resources/logical_deduction_three_objects.json
--- a/lm_eval/datasets/bigbench_resources/movie_recommendation.json
+++ b/lm_eval/datasets/bigbench_resources/movie_recommendation.json
--- a/lm_eval/datasets/bigbench_resources/navigate.json
+++ b/lm_eval/datasets/bigbench_resources/navigate.json
--- a/lm_eval/datasets/bigbench_resources/reasoning_about_colored_objects.json
+++ b/lm_eval/datasets/bigbench_resources/reasoning_about_colored_objects.json
--- a/lm_eval/datasets/bigbench_resources/ruin_names.json
+++ b/lm_eval/datasets/bigbench_resources/ruin_names.json
--- a/lm_eval/datasets/bigbench_resources/salient_translation_error_detection.json
+++ b/lm_eval/datasets/bigbench_resources/salient_translation_error_detection.json
--- a/lm_eval/datasets/bigbench_resources/snarks.json
+++ b/lm_eval/datasets/bigbench_resources/snarks.json
--- a/lm_eval/datasets/bigbench_resources/sports_understanding.json
+++ b/lm_eval/datasets/bigbench_resources/sports_understanding.json
--- a/lm_eval/datasets/bigbench_resources/temporal_sequences.json
+++ b/lm_eval/datasets/bigbench_resources/temporal_sequences.json
--- a/lm_eval/datasets/bigbench_resources/tracking_shuffled_objects_five_objects.json
+++ b/lm_eval/datasets/bigbench_resources/tracking_shuffled_objects_five_objects.json
--- a/lm_eval/datasets/bigbench_resources/tracking_shuffled_objects_seven_objects.json
+++ b/lm_eval/datasets/bigbench_resources/tracking_shuffled_objects_seven_objects.json
--- a/lm_eval/datasets/bigbench_resources/tracking_shuffled_objects_three_objects.json
+++ b/lm_eval/datasets/bigbench_resources/tracking_shuffled_objects_three_objects.json
--- a/lm_eval/datasets/coqa/__init__.py
+++ b/lm_eval/datasets/coqa/__init__.py