Resolved merge conflicts

This commit is contained in:
Chantal D Gama Rose 2025-03-14 14:18:23 -07:00
parent 3b3195d8e6
commit eebb0f6e61
8 changed files with 0 additions and 124 deletions

View file

@ -102,4 +102,3 @@ def pytest_generate_tests(metafunc):
get_provider_fixture_overrides(metafunc.config, available_fixtures) or DEFAULT_PROVIDER_COMBINATIONS
)
metafunc.parametrize("safety_stack", combinations, indirect=True)