shoot: fix the merge

Feel-ix-343 · Mar 3, 2024 · 10184e4 · 10184e4
1 parent 75fc7cb
commit 10184e4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/vault/mod.rs b/src/vault/mod.rs
@@ -1153,11 +1153,7 @@ pub struct Refname {
 }
 
 impl Refname {
-<<<<<<< HEAD
     pub fn link_file_key(&self) -> Option<String> {
-=======
-    fn link_file_key(&self) -> Option<String> {
->>>>>>> a4009b25ad2199ae2979475f1d03afebf051d93a
 
         let path = &self.path.clone()?;