From e29f4d5c7f65ba1de166e3693f475aaebc7b0a14 Mon Sep 17 00:00:00 2001
From: Matthias Eckert <matthias.eckert@vico-research.com>
Date: Mon, 10 Jul 2023 09:10:38 +0200
Subject: [PATCH] fixed rebase

---
 journals/2023_07_10.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/journals/2023_07_10.md b/journals/2023_07_10.md
index 9daeff90..74c7ed2e 100644
--- a/journals/2023_07_10.md
+++ b/journals/2023_07_10.md
@@ -1,5 +1 @@
-<<<<<<< HEAD
--
-=======
-- [[English Lesson]]
->>>>>>> be30e0a (Auto saved by Logseq)
+- [[English Lesson]]
\ No newline at end of file