From 10184e4c5f62b57851269d7f48ac8bbeef0bced4 Mon Sep 17 00:00:00 2001
From: Felix Zeller <felixazeller@gmail.com>
Date: Sat, 2 Mar 2024 20:33:11 -0500
Subject: [PATCH] shoot: fix the merge

---
 src/vault/mod.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/vault/mod.rs b/src/vault/mod.rs
index a4f6c49c..0fc76c73 100644
--- 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()?;