diff options
| author | JODBaer <JODBaer@github.com> | 2021-04-22 23:45:32 +0200 |
|---|---|---|
| committer | JODBaer <JODBaer@github.com> | 2021-04-22 23:45:32 +0200 |
| commit | 8c6a8e56c125c238dc64c21d1269fcdc7542c5cd (patch) | |
| tree | 5cb96d3269a17a9f0cc5339b9308cf3710eb10fa /buch/papers | |
| parent | Update RS.tex (diff) | |
| download | SeminarMatrizen-8c6a8e56c125c238dc64c21d1269fcdc7542c5cd.tar.gz SeminarMatrizen-8c6a8e56c125c238dc64c21d1269fcdc7542c5cd.zip | |
merge lines gelöscht
Diffstat (limited to 'buch/papers')
| -rw-r--r-- | buch/papers/reedsolomon/RS presentation/RS.tex | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/buch/papers/reedsolomon/RS presentation/RS.tex b/buch/papers/reedsolomon/RS presentation/RS.tex index 61324f7..943f2da 100644 --- a/buch/papers/reedsolomon/RS presentation/RS.tex +++ b/buch/papers/reedsolomon/RS presentation/RS.tex @@ -84,11 +84,9 @@ \end{tabular} \end{center} \end{frame} -<<<<<<< Updated upstream + %------------------------------------------------------------------------------- -======= ->>>>>>> Stashed changes \section{Diskrete Fourier Transformation} \begin{frame} \frametitle{Idee} @@ -184,13 +182,12 @@ Indem in einem endlichen Körper gerechnet wird. } \end{frame} -<<<<<<< Updated upstream + %------------------------------------------------------------------------------- -======= + \section{Reed-Solomon in Endlichen Körpern} ->>>>>>> Stashed changes \begin{frame} \frametitle{Reed-Solomon in Endlichen Körpern} |