From ff150000cd26aabc2409e42295b0adbb4cb9a175 Mon Sep 17 00:00:00 2001 From: hermes Date: Thu, 3 Sep 2026 18:12:05 +0000 Subject: [PATCH] fix(tests): remove conflict markers in playwright_helper.py --- tests/playwright_helper.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/playwright_helper.py b/tests/playwright_helper.py index d1cd9e1..ef260b4 100644 --- a/tests/playwright_helper.py +++ b/tests/playwright_helper.py @@ -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]: