From ed47754b46d2556be76169829cae692ab1203c8f Mon Sep 17 00:00:00 2001
From: Neo <neo101neo101@gmail.com>
Date: Wed, 19 Nov 2025 05:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etl_billiards/config/env_parser.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/etl_billiards/config/env_parser.py b/etl_billiards/config/env_parser.py
index e9da6a2..431e08c 100644
--- a/etl_billiards/config/env_parser.py
+++ b/etl_billiards/config/env_parser.py
@@ -24,12 +24,9 @@ ENV_MAP = {
     "OVERLAP_SECONDS":        ("run.overlap_seconds",),
     "WINDOW_BUSY_MIN":        ("run.window_minutes.default_busy",),
     "WINDOW_IDLE_MIN":        ("run.window_minutes.default_idle",),
-<<<<<<< HEAD
-=======
     "TEST_MODE":              ("testing.mode",),
     "TEST_JSON_ARCHIVE_DIR":  ("testing.json_archive_dir",),
     "TEST_JSON_TEMP_DIR":     ("testing.temp_json_dir",),
->>>>>>> main
 }
 
 def _deep_set(d, dotted_keys, value):