aboutsummaryrefslogtreecommitdiffstats
path: root/buch/papers
diff options
context:
space:
mode:
authorErik Löffler <erik.loeffler@ost.ch>2022-08-05 11:27:41 +0200
committerErik Löffler <erik.loeffler@ost.ch>2022-08-05 11:27:41 +0200
commitf850f096e7c68c4f128f017bb07a82705be476c6 (patch)
treef9947a6431fa1d5431756723c477bdbc37831f51 /buch/papers
parentMerge remote-tracking branch 'origin/sturmliouville/redabranch' into sturmlio... (diff)
downloadSeminarSpezielleFunktionen-f850f096e7c68c4f128f017bb07a82705be476c6.tar.gz
SeminarSpezielleFunktionen-f850f096e7c68c4f128f017bb07a82705be476c6.zip
Resolved issue in main.tex
Diffstat (limited to '')
-rw-r--r--buch/papers/sturmliouville/main.tex1
1 files changed, 0 insertions, 1 deletions
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}