From 3b33b6655ce55b3cc47b61147283c0575ac950a5 Mon Sep 17 00:00:00 2001
From: Matthias Eckert <matthias.eckert@vico-research.com>
Date: Mon, 10 Jul 2023 08:33:02 +0200
Subject: [PATCH] Auto saved by Logseq

---
 journals/2023_07_03.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/journals/2023_07_03.md b/journals/2023_07_03.md
index 4fcad97a..b4989919 100644
--- a/journals/2023_07_03.md
+++ b/journals/2023_07_03.md
@@ -1,6 +1,11 @@
+<<<<<<< HEAD
 - Fixing 'Umount Target is Busy' Error in Linux
 	- https://linuxhandbook.com/umount-target-busy/#:~:text=this%20problem%20first.-,The%20reason%20behind%20Umount%20target%20is%20busy,t%20allow%20you%20to%20unmount.
 	- ``sudo lsof /mnt/ext-fast``
 		- samba is the culprit
 	- `` sudo service smbd stop``
-	-
\ No newline at end of file
+	-
+=======
+-
+-
+>>>>>>> 522cf26 (Auto saved by Logseq)