From 06ea64eee93cba2fb93d448f58ba443588053c4e Mon Sep 17 00:00:00 2001
From: italic-jinxin <106428113+italic-jinxin@users.noreply.github.com>
Date: Mon, 23 Mar 2026 12:28:51 +0800
Subject: [PATCH] chore: resolve conflicts

---
 src/config/llm.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/llm.rs b/src/config/llm.rs
index 5a04f840..3ff71f7e 100644
--- a/src/config/llm.rs
+++ b/src/config/llm.rs
@@ -614,7 +614,7 @@ pub fn default_session_path() -> PathBuf {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::config::helpers::lock_env;
+    use crate::config::helpers::{ENV_MUTEX, lock_env};
     use crate::settings::Settings;
     use crate::testing::credentials::*;