From 8c6a8e56c125c238dc64c21d1269fcdc7542c5cd Mon Sep 17 00:00:00 2001 From: JODBaer Date: Thu, 22 Apr 2021 23:45:32 +0200 Subject: =?UTF-8?q?merge=20lines=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buch/papers/reedsolomon/RS presentation/RS.tex | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'buch') 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} -- cgit v1.2.1