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_principle_A_domain_3-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_domain_3-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_reconstruction-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_reconstruction-v0-loglikelihood
--- a/tests/tests/testdata/blimp_principle_A_reconstruction-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_reconstruction-v0-res.json
--- a/tests/tests/testdata/blimp_regular_plural_subject_verb_agreement_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_regular_plural_subject_verb_agreement_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_regular_plural_subject_verb_agreement_1-v0-res.json
+++ b/tests/tests/testdata/blimp_regular_plural_subject_verb_agreement_1-v0-res.json
--- a/tests/tests/testdata/blimp_regular_plural_subject_verb_agreement_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_regular_plural_subject_verb_agreement_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_regular_plural_subject_verb_agreement_2-v0-res.json
+++ b/tests/tests/testdata/blimp_regular_plural_subject_verb_agreement_2-v0-res.json
--- a/tests/tests/testdata/blimp_sentential_negation_npi_licensor_present-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_sentential_negation_npi_licensor_present-v0-loglikelihood
--- a/tests/tests/testdata/blimp_sentential_negation_npi_licensor_present-v0-res.json
+++ b/tests/tests/testdata/blimp_sentential_negation_npi_licensor_present-v0-res.json
--- a/tests/tests/testdata/blimp_sentential_negation_npi_scope-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_sentential_negation_npi_scope-v0-loglikelihood
--- a/tests/tests/testdata/blimp_sentential_negation_npi_scope-v0-res.json
+++ b/tests/tests/testdata/blimp_sentential_negation_npi_scope-v0-res.json
--- a/tests/tests/testdata/blimp_sentential_subject_island-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_sentential_subject_island-v0-loglikelihood
--- a/tests/tests/testdata/blimp_sentential_subject_island-v0-res.json
+++ b/tests/tests/testdata/blimp_sentential_subject_island-v0-res.json
--- a/tests/tests/testdata/blimp_superlative_quantifiers_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_superlative_quantifiers_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_superlative_quantifiers_1-v0-res.json
+++ b/tests/tests/testdata/blimp_superlative_quantifiers_1-v0-res.json
--- a/tests/tests/testdata/blimp_superlative_quantifiers_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_superlative_quantifiers_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_superlative_quantifiers_2-v0-res.json
+++ b/tests/tests/testdata/blimp_superlative_quantifiers_2-v0-res.json
--- a/tests/tests/testdata/blimp_tough_vs_raising_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_tough_vs_raising_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_tough_vs_raising_1-v0-res.json
+++ b/tests/tests/testdata/blimp_tough_vs_raising_1-v0-res.json
--- a/tests/tests/testdata/blimp_tough_vs_raising_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_tough_vs_raising_2-v0-loglikelihood