chore: resolve conflicts

This commit is contained in:
italic-jinxin
2026-03-23 12:28:51 +08:00
parent e17edd1831
commit 06ea64eee9
+1 -1
View File
@@ -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::*;