From 9d435d36c9f3e1036e50901d983f257a6e0e3dfa Mon Sep 17 00:00:00 2001
From: sxyazi <sxyazi@gmail.com>
Date: Wed, 27 Sep 2023 08:42:14 +0800
Subject: [PATCH] rebase and resolve conflict

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

diff --git a/shared/src/fns.rs b/shared/src/fns.rs
index 7018a3d9..2ac3234d 100644
--- a/shared/src/fns.rs
+++ b/shared/src/fns.rs
@@ -1,4 +1,4 @@
-use std::{env, ffi::OsStr, fmt::Display, path::{Component, Path, PathBuf}};
+use std::{borrow::Cow, env, ffi::OsStr, fmt::Display, path::{Component, Path, PathBuf}};
 
 use tokio::fs;