resolved git conflict

470fb31c · lintangsutawika · dfb41835 · 4d10ad56 · 470fb31c · 470fb31c
Commit 470fb31c authored Jan 02, 2024 by lintangsutawika
20 changed files
--- a/lm_eval/tasks/kmmlu/kmmlu_environmental_science.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_environmental_science.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_food_processing.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_food_processing.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_gas_technology_and_engineering.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_gas_technology_and_engineering.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_general_physics.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_general_physics.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_industrial_engineer.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_industrial_engineer.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_information_technology.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_information_technology.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_interior_architecture_and_design.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_interior_architecture_and_design.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_korean_language.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_korean_language.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_machine_design_and_manufacturing.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_machine_design_and_manufacturing.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_maritime_engineering.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_maritime_engineering.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_materials_engineering.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_materials_engineering.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_mechanical_engineering.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_mechanical_engineering.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_nondestructive_testing.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_nondestructive_testing.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_political_science_and_sociology.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_political_science_and_sociology.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_public_safety.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_public_safety.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_railway_and_automotive_engineering.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_railway_and_automotive_engineering.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_real_estate.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_real_estate.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_refrigerating_machinery.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_refrigerating_machinery.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_social_welfare.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_social_welfare.yaml
--- a/lm_eval/tasks/kmmlu/kmmlu_telecommunications_and_wireless_technology.yaml
+++ b/lm_eval/tasks/kmmlu/kmmlu_telecommunications_and_wireless_technology.yaml