aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--buch/papers/reedsolomon/RS presentation/RS.tex9
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}