X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/hpcc2014.git/blobdiff_plain/c3bfcd6a7a6c9b0dcb1bcdc52facec1fe257f658..da679beb2e5ea3a7a07a474d5a751de50de54f8b:/hpcc.tex

diff --git a/hpcc.tex b/hpcc.tex
index c2f5a1b..84f5278 100644
--- 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}