Merge branch 'main' of github.com:Feel-ix-343/obsidian-markdown-ls

Feel-ix-343 · Mar 3, 2024 · 75fc7cb · 75fc7cb
2 parents 730f2fb + a4009b2
commit 75fc7cb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/TestFiles/A third test.md b/TestFiles/A third test.md
@@ -16,6 +16,10 @@
 
 
 
+
+[](folder/Fiile)
+
+
 [[Another Test]]
 
 

diff --git a/TestFiles/folder/File.md → TestFiles/folder/Fiile.md b/TestFiles/folder/File.md → TestFiles/folder/Fiile.md
@@ -1,11 +1,10 @@
+
 [[Another Test]]
 
 # Heading
 
 #tag/subtag
 
-[[^]]
-
 
 Here is a very simple and normal paragraph man!!!!   ^1
 
@@ -15,4 +14,4 @@ more footntoe[^2]
 [^2]: This is a different footntoe
 
 
-[[folder/File#^ZxY7P]]
+[[folder/Fiile#ZxY7P]]
diff --git a/src/vault/mod.rs b/src/vault/mod.rs
@@ -1153,7 +1153,11 @@ 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()?;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,10 @@




		[](folder/Fiile)


		[[Another Test]]


Expand Down