diff options
author | Erik Löffler <erik.loeffler@ost.ch> | 2022-08-03 23:50:12 +0200 |
---|---|---|
committer | Erik Löffler <erik.loeffler@ost.ch> | 2022-08-03 23:50:12 +0200 |
commit | 32c4ffb921b696a6421fd9298b8b80f5528bdc06 (patch) | |
tree | 26e74f769a93b0d36859180614586c0b560f0901 /buch/papers/sturmliouville/main.tex | |
parent | Added solution for T(t) in fourier example. (diff) | |
parent | Update einleitung.tex (diff) | |
download | SeminarSpezielleFunktionen-32c4ffb921b696a6421fd9298b8b80f5528bdc06.tar.gz SeminarSpezielleFunktionen-32c4ffb921b696a6421fd9298b8b80f5528bdc06.zip |
Merge remote-tracking branch 'origin/sturmliouville/redabranch' into sturmliouville/erik-branch
Diffstat (limited to 'buch/papers/sturmliouville/main.tex')
-rw-r--r-- | buch/papers/sturmliouville/main.tex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/buch/papers/sturmliouville/main.tex b/buch/papers/sturmliouville/main.tex index 4b5b8af..559a448 100644 --- a/buch/papers/sturmliouville/main.tex +++ b/buch/papers/sturmliouville/main.tex @@ -9,6 +9,7 @@ \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} |