resolve conflicts

.phpunit.cache/test-results

@@ -1 +1 @@
-{"version":"pest_2.36.0","defects":[],"times":{"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\AskToRunMigrationsTest::__pest_evaluable_it_can_ask_to_run_the_migrations":0.048,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\AssetsTest::__pest_evaluable_it_can_install_the_assets":0.011,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\ConfigFileTest::__pest_evaluable_it_can_install_the_config_file":0.001,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\CopyAndRegisterServiceProviderInAppTest::__pest_evaluable_it_can_copy_and_register_the_service_provider_in_the_app":0.003,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\EndWithTest::__pest_evaluable_it_can_execute_the_end_with":0.001,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\MigrationTest::__pest_evaluable_it_can_install_the_migrations":0.002,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\StarRepoTest::__pest_evaluable_it_can_propose_to_star_the_repo":0.001,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\StartWithTest::__pest_evaluable_it_can_execute_the_start_with":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageAssetsTest::__pest_evaluable_it_can_publish_the_assets":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageCommandTest::__pest_evaluable_it_can_execute_a_registered_commands":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageCommandWithinAppTest::__pest_evaluable_it_can_execute_a_registered_command_in_the_context_of_the_app":0.012,"P\\Tests\\PackageServiceProviderTests\\PackageCommandsTest::__pest_evaluable_it_can_execute_a_registered_commands":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageConfigTest::__pest_evaluable_it_can_register_the_config_file":0,"P\\Tests\\PackageServiceProviderTests\\PackageConfigTest::__pest_evaluable_it_can_publish_the_config_file":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageDiscoversMigrationsTest::__pest_evaluable_it_publishes_discovered_migrations":0.004,"P\\Tests\\PackageServiceProviderTests\\PackageDiscoversMigrationsTest::__pest_evaluable_it_can_publish_the_migration_without_being_stubbed":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageDiscoversMigrationsTest::__pest_evaluable_it_does_not_overwrite_the_existing_migration":0.004,"P\\Tests\\PackageServiceProviderTests\\PackageDiscoversMigrationsTest::__pest_evaluable_it_can_run_migrations_which_registers_them":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageMigrationTest::__pest_evaluable_it_can_publish_the_migration":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageMigrationTest::__pest_evaluable_it_can_publish_the_migration_without_being_stubbed":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageMigrationTest::__pest_evaluable_it_does_not_overwrite_the_existing_migration":0.003,"P\\Tests\\PackageServiceProviderTests\\PackageMigrationTest::__pest_evaluable_it_does_overwrite_the_existing_migration_with_force":0.003,"P\\Tests\\PackageServiceProviderTests\\PackageMigrationTest::__pest_evaluable_it_can_run_migrations_which_registers_them":0,"P\\Tests\\PackageServiceProviderTests\\PackageMultipleConfigTest::__pest_evaluable_it_can_register_multiple_config_files":0,"P\\Tests\\PackageServiceProviderTests\\PackageNameTest::__pest_evaluable_it_will_not_blow_up_when_a_name_is_set":0,"P\\Tests\\PackageServiceProviderTests\\PackagePublishableProviderTest::__pest_evaluable_it_can_publish_a_service_provider":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageRouteTest::__pest_evaluable_it_can_load_the_route":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageRouteTest::__pest_evaluable_it_can_load_multiple_route":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageRoutesTest::__pest_evaluable_it_can_load_the_route":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageRoutesTest::__pest_evaluable_it_can_load_multiple_route":0,"P\\Tests\\PackageServiceProviderTests\\PackageSharedDataTest::__pest_evaluable_it_can_share_data_with_all_views":0.004,"P\\Tests\\PackageServiceProviderTests\\PackageTranslationsTest::__pest_evaluable_it_can_load_the_translations":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageTranslationsTest::__pest_evaluable_it_can_publish_the_translations":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageViewComponentsTest::__pest_evaluable_it_can_load_the_view_components":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageViewComponentsTest::__pest_evaluable_it_can_publish_the_view_components":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageViewComposerTest::__pest_evaluable_it_can_load_the_view_composer_and_render_shared_data":0,"P\\Tests\\PackageServiceProviderTests\\PackageViewsTest::__pest_evaluable_it_can_load_the_views":0,"P\\Tests\\PackageServiceProviderTests\\PackageViewsTest::__pest_evaluable_it_can_publish_the_views":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageViewsWithCustomNamespaceTest::__pest_evaluable_it_can_load_the_views_with_a_custom_namespace":0,"P\\Tests\\PackageServiceProviderTests\\PackageViewsWithCustomNamespaceTest::__pest_evaluable_it_can_publish_the_views_with_a_custom_namespace":0.001}}
+{"version":"pest_2.36.0","defects":[],"times":{"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\AskToRunMigrationsTest::__pest_evaluable_it_can_ask_to_run_the_migrations":0.044,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\AssetsTest::__pest_evaluable_it_can_install_the_assets":0.009,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\ConfigFileTest::__pest_evaluable_it_can_install_the_config_file":0.001,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\CopyAndRegisterServiceProviderInAppTest::__pest_evaluable_it_can_copy_and_register_the_service_provider_in_the_app":0.003,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\EndWithTest::__pest_evaluable_it_can_execute_the_end_with":0.001,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\MigrationTest::__pest_evaluable_it_can_install_the_migrations":0.002,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\StarRepoTest::__pest_evaluable_it_can_propose_to_star_the_repo":0.001,"P\\Tests\\PackageServiceProviderTests\\InstallCommandTests\\StartWithTest::__pest_evaluable_it_can_execute_the_start_with":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageAssetsTest::__pest_evaluable_it_can_publish_the_assets":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageCommandTest::__pest_evaluable_it_can_execute_a_registered_commands":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageCommandWithinAppTest::__pest_evaluable_it_can_execute_a_registered_command_in_the_context_of_the_app":0.011,"P\\Tests\\PackageServiceProviderTests\\PackageCommandsTest::__pest_evaluable_it_can_execute_a_registered_commands":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageConfigTest::__pest_evaluable_it_can_register_the_config_file":0,"P\\Tests\\PackageServiceProviderTests\\PackageConfigTest::__pest_evaluable_it_can_publish_the_config_file":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageDiscoversMigrationsTest::__pest_evaluable_it_publishes_discovered_migrations":0.003,"P\\Tests\\PackageServiceProviderTests\\PackageDiscoversMigrationsTest::__pest_evaluable_it_can_publish_the_migration_without_being_stubbed":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageDiscoversMigrationsTest::__pest_evaluable_it_does_not_overwrite_the_existing_migration":0.004,"P\\Tests\\PackageServiceProviderTests\\PackageDiscoversMigrationsTest::__pest_evaluable_it_can_run_migrations_which_registers_them":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageMigrationTest::__pest_evaluable_it_can_publish_the_migration":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageMigrationTest::__pest_evaluable_it_can_publish_the_migration_without_being_stubbed":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageMigrationTest::__pest_evaluable_it_does_not_overwrite_the_existing_migration":0.004,"P\\Tests\\PackageServiceProviderTests\\PackageMigrationTest::__pest_evaluable_it_does_overwrite_the_existing_migration_with_force":0.003,"P\\Tests\\PackageServiceProviderTests\\PackageMigrationTest::__pest_evaluable_it_can_run_migrations_which_registers_them":0,"P\\Tests\\PackageServiceProviderTests\\PackageMultipleConfigTest::__pest_evaluable_it_can_register_multiple_config_files":0,"P\\Tests\\PackageServiceProviderTests\\PackageNameTest::__pest_evaluable_it_will_not_blow_up_when_a_name_is_set":0,"P\\Tests\\PackageServiceProviderTests\\PackagePublishableProviderTest::__pest_evaluable_it_can_publish_a_service_provider":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageRouteTest::__pest_evaluable_it_can_load_the_route":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageRouteTest::__pest_evaluable_it_can_load_multiple_route":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageRoutesTest::__pest_evaluable_it_can_load_the_route":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageRoutesTest::__pest_evaluable_it_can_load_multiple_route":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageSharedDataTest::__pest_evaluable_it_can_share_data_with_all_views":0.005,"P\\Tests\\PackageServiceProviderTests\\PackageTranslationsTest::__pest_evaluable_it_can_load_the_translations":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageTranslationsTest::__pest_evaluable_it_can_publish_the_translations":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageViewComponentsTest::__pest_evaluable_it_can_load_the_view_components":0.002,"P\\Tests\\PackageServiceProviderTests\\PackageViewComponentsTest::__pest_evaluable_it_can_publish_the_view_components":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageViewComposerTest::__pest_evaluable_it_can_load_the_view_composer_and_render_shared_data":0,"P\\Tests\\PackageServiceProviderTests\\PackageViewsTest::__pest_evaluable_it_can_load_the_views":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageViewsTest::__pest_evaluable_it_can_publish_the_views":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageViewsWithCustomNamespaceTest::__pest_evaluable_it_can_load_the_views_with_a_custom_namespace":0.001,"P\\Tests\\PackageServiceProviderTests\\PackageViewsWithCustomNamespaceTest::__pest_evaluable_it_can_publish_the_views_with_a_custom_namespace":0.001}}