Delete merge cruft.

[hpcc2014.git] / hpcc.tex

diff --git a/hpcc.tex b/hpcc.tex
index 1179edb87cf90ad145a9103c8bd6dbb4186b86d9..84f5278e9698407a2082e89e02aab44f4d6f1736 100644 (file)
--- a/hpcc.tex
+++ b/hpcc.tex
@@ -259,7 +259,7 @@ their bandwidth and latency, and the routing strategy.  The simulated running
 time of the application is computed according to these properties.
 
 To compute the durations of the operations in the simulated world, and to take
-into account resource sharing (e.g.  bandwith sharing between competiting
+into account resource sharing (e.g. bandwidth sharing between competing
 communications), SimGrid uses a fluid model.  This allows to run relatively fast
 simulations, while still keeping accurate
 results~\cite{bedaride:hal-00919507,tomacs13}.  Moreover, depending on the
@@ -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}