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_npi_present_2-v0-res.json
+++ b/tests/tests/testdata/blimp_npi_present_2-v0-res.json
--- a/tests/tests/testdata/blimp_only_npi_licensor_present-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_only_npi_licensor_present-v0-loglikelihood
--- a/tests/tests/testdata/blimp_only_npi_licensor_present-v0-res.json
+++ b/tests/tests/testdata/blimp_only_npi_licensor_present-v0-res.json
--- a/tests/tests/testdata/blimp_only_npi_scope-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_only_npi_scope-v0-loglikelihood
--- a/tests/tests/testdata/blimp_only_npi_scope-v0-res.json
+++ b/tests/tests/testdata/blimp_only_npi_scope-v0-res.json
--- a/tests/tests/testdata/blimp_passive_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_passive_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_passive_1-v0-res.json
+++ b/tests/tests/testdata/blimp_passive_1-v0-res.json
--- a/tests/tests/testdata/blimp_passive_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_passive_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_passive_2-v0-res.json
+++ b/tests/tests/testdata/blimp_passive_2-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_c_command-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_c_command-v0-loglikelihood
--- a/tests/tests/testdata/blimp_principle_A_c_command-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_c_command-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_case_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_case_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_principle_A_case_1-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_case_1-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_case_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_case_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_principle_A_case_2-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_case_2-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_domain_1-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_domain_1-v0-loglikelihood
--- a/tests/tests/testdata/blimp_principle_A_domain_1-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_domain_1-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_domain_2-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_domain_2-v0-loglikelihood
--- a/tests/tests/testdata/blimp_principle_A_domain_2-v0-res.json
+++ b/tests/tests/testdata/blimp_principle_A_domain_2-v0-res.json
--- a/tests/tests/testdata/blimp_principle_A_domain_3-v0-loglikelihood
+++ b/tests/tests/testdata/blimp_principle_A_domain_3-v0-loglikelihood