From 14eed08ff5e4f9af380aaa19978a5b31d5dc460b Mon Sep 17 00:00:00 2001 From: Dorian Date: Wed, 23 Sep 2026 15:36:46 +0200 Subject: [PATCH] fix(mock_api): remove merge conflict markers --- apps/backend/app/etl/mock_api_import.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/backend/app/etl/mock_api_import.py b/apps/backend/app/etl/mock_api_import.py index ca24d2b..71e2e32 100644 --- a/apps/backend/app/etl/mock_api_import.py +++ b/apps/backend/app/etl/mock_api_import.py @@ -184,9 +184,7 @@ async def upsert_sites( ) -def _timestamp_in_window( - reading: dict[str, Any], start_time: datetime, end_time: datetime -) -> bool: +def _timestamp_in_window(reading: dict[str, Any], start_time: datetime, end_time: datetime) -> bool: valeur = reading.get("timestamp") if not isinstance(valeur, str): return False