Delete merge cruft.

[hpcc2014.git] / hpcc.tex

diff --git a/hpcc.tex b/hpcc.tex
index c2f5a1ba8e72c2e8c9f9e70f51eea406b781f22b..84f5278e9698407a2082e89e02aab44f4d6f1736 100644 (file)
--- a/hpcc.tex
+++ b/hpcc.tex
@@ -588,11 +588,8 @@ lat latency, \dots{}).
        \item Maximum number of internal and external iterations;
        \item Internal and external precisions;
        \item Matrix size $N_x$, $N_y$ and $N_z$;
-%<<<<<<< HEAD
        \item Matrix diagonal value: \np{6.0};
        \item Matrix Off-diagonal value: \np{-1.0};
-%=======
-%>>>>>>> 5fb6769d88c1720b6480a28521119ef010462fa6
        \item Execution Mode: synchronous or asynchronous.
 \end{itemize}