aboutsummaryrefslogtreecommitdiffstats
path: root/buch/papers/sturmliouville
diff options
context:
space:
mode:
Diffstat (limited to 'buch/papers/sturmliouville')
-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}