fix(tests): remove conflict markers in playwright_helper.py

This commit is contained in:
hermes
2026-09-03 18:12:05 +00:00
parent 7cdd58d359
commit ff150000cd
-3
View File
@@ -196,9 +196,6 @@ class BrencherPage:
@contextmanager
def brencher_page(
app_link: str,
<<<<<<< HEAD
env_id: str = "brencher_local1",
=======
env_id: str,
action_logger: logging.Logger | None = None,
) -> Generator[BrencherPage, None, None]: