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_inchoative-v0-res.json
+++ b/tests/tests/testdata/blimp_inchoative-v0-res.json
--- a/tests/tests/testdata/blimp_intransitive-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_intransitive-v0-loglikelihood
--- a/tests/tests/testdata/blimp_intransitive-v0-res.json
+++ b/tests/tests/testdata/blimp_intransitive-v0-res.json
--- a/tests/tests/testdata/blimp_irregular_past_participle_adjectives-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_irregular_past_participle_adjectives-v0-loglikelihood
--- a/tests/tests/testdata/blimp_irregular_past_participle_adjectives-v0-res.json
+++ b/tests/tests/testdata/blimp_irregular_past_participle_adjectives-v0-res.json
--- a/tests/tests/testdata/blimp_irregular_past_participle_verbs-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_irregular_past_participle_verbs-v0-loglikelihood
--- a/tests/tests/testdata/blimp_irregular_past_participle_verbs-v0-res.json
+++ b/tests/tests/testdata/blimp_irregular_past_participle_verbs-v0-res.json
--- a/tests/tests/testdata/blimp_irregular_plural_subject_verb_agreement_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_irregular_plural_subject_verb_agreement_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_irregular_plural_subject_verb_agreement_1-v0-res.json
+++ b/tests/tests/testdata/blimp_irregular_plural_subject_verb_agreement_1-v0-res.json
--- a/tests/tests/testdata/blimp_irregular_plural_subject_verb_agreement_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_irregular_plural_subject_verb_agreement_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_irregular_plural_subject_verb_agreement_2-v0-res.json
+++ b/tests/tests/testdata/blimp_irregular_plural_subject_verb_agreement_2-v0-res.json
--- a/tests/tests/testdata/blimp_left_branch_island_echo_question-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_left_branch_island_echo_question-v0-loglikelihood
--- a/tests/tests/testdata/blimp_left_branch_island_echo_question-v0-res.json
+++ b/tests/tests/testdata/blimp_left_branch_island_echo_question-v0-res.json
--- a/tests/tests/testdata/blimp_left_branch_island_simple_question-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_left_branch_island_simple_question-v0-loglikelihood
--- a/tests/tests/testdata/blimp_left_branch_island_simple_question-v0-res.json
+++ b/tests/tests/testdata/blimp_left_branch_island_simple_question-v0-res.json
--- a/tests/tests/testdata/blimp_matrix_question_npi_licensor_present-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_matrix_question_npi_licensor_present-v0-loglikelihood
--- a/tests/tests/testdata/blimp_matrix_question_npi_licensor_present-v0-res.json
+++ b/tests/tests/testdata/blimp_matrix_question_npi_licensor_present-v0-res.json
--- a/tests/tests/testdata/blimp_npi_present_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_npi_present_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_npi_present_1-v0-res.json
+++ b/tests/tests/testdata/blimp_npi_present_1-v0-res.json
--- a/tests/tests/testdata/blimp_npi_present_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_npi_present_2-v0-loglikelihood