fix conflict for upstream

63001b68 · bzantium · a956bc63 · 84ef60ee · 63001b68 · 63001b68
Commit 63001b68 authored May 23, 2023 by bzantium
20 changed files
--- a/tests/tests/testdata/blimp_distractor_agreement_relational_noun-v0-res.json
+++ b/tests/tests/testdata/blimp_distractor_agreement_relational_noun-v0-res.json
--- a/tests/tests/testdata/blimp_distractor_agreement_relative_clause-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_distractor_agreement_relative_clause-v0-loglikelihood
--- a/tests/tests/testdata/blimp_distractor_agreement_relative_clause-v0-res.json
+++ b/tests/tests/testdata/blimp_distractor_agreement_relative_clause-v0-res.json
--- a/tests/tests/testdata/blimp_drop_argument-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_drop_argument-v0-loglikelihood
--- a/tests/tests/testdata/blimp_drop_argument-v0-res.json
+++ b/tests/tests/testdata/blimp_drop_argument-v0-res.json
--- a/tests/tests/testdata/blimp_ellipsis_n_bar_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_ellipsis_n_bar_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_ellipsis_n_bar_1-v0-res.json
+++ b/tests/tests/testdata/blimp_ellipsis_n_bar_1-v0-res.json
--- a/tests/tests/testdata/blimp_ellipsis_n_bar_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_ellipsis_n_bar_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_ellipsis_n_bar_2-v0-res.json
+++ b/tests/tests/testdata/blimp_ellipsis_n_bar_2-v0-res.json
--- a/tests/tests/testdata/blimp_existential_there_object_raising-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_existential_there_object_raising-v0-loglikelihood
--- a/tests/tests/testdata/blimp_existential_there_object_raising-v0-res.json
+++ b/tests/tests/testdata/blimp_existential_there_object_raising-v0-res.json
--- a/tests/tests/testdata/blimp_existential_there_quantifiers_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_existential_there_quantifiers_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_existential_there_quantifiers_1-v0-res.json
+++ b/tests/tests/testdata/blimp_existential_there_quantifiers_1-v0-res.json
--- a/tests/tests/testdata/blimp_existential_there_quantifiers_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_existential_there_quantifiers_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_existential_there_quantifiers_2-v0-res.json
+++ b/tests/tests/testdata/blimp_existential_there_quantifiers_2-v0-res.json
--- a/tests/tests/testdata/blimp_existential_there_subject_raising-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_existential_there_subject_raising-v0-loglikelihood
--- a/tests/tests/testdata/blimp_existential_there_subject_raising-v0-res.json
+++ b/tests/tests/testdata/blimp_existential_there_subject_raising-v0-res.json
--- a/tests/tests/testdata/blimp_expletive_it_object_raising-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_expletive_it_object_raising-v0-loglikelihood
--- a/tests/tests/testdata/blimp_expletive_it_object_raising-v0-res.json
+++ b/tests/tests/testdata/blimp_expletive_it_object_raising-v0-res.json
--- a/tests/tests/testdata/blimp_inchoative-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_inchoative-v0-loglikelihood