From f850f096e7c68c4f128f017bb07a82705be476c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20L=C3=B6ffler?= <erik.loeffler@ost.ch>
Date: Fri, 5 Aug 2022 11:27:41 +0200
Subject: Resolved issue in main.tex

---
 buch/papers/sturmliouville/main.tex | 1 -
 1 file changed, 1 deletion(-)

(limited to 'buch/papers/sturmliouville/main.tex')

diff --git a/buch/papers/sturmliouville/main.tex b/buch/papers/sturmliouville/main.tex
index 559a448..4b5b8af 100644
--- a/buch/papers/sturmliouville/main.tex
+++ b/buch/papers/sturmliouville/main.tex
@@ -9,7 +9,6 @@
 \begin{refsection}
 \chapterauthor{Réda Haddouche und Erik Löffler}
 
-<<<<<<< HEAD
 \input{papers/sturmliouville/einleitung.tex}
 %einleitung "was ist das sturm-liouville-problem"
 \input{papers/sturmliouville/eigenschaften.tex}
-- 
cgit v1.2.1

