From: scastelli <stephane.castelli@inria.fr>
Date: Wed, 4 Jun 2014 18:32:59 +0000 (+0200)
Subject: Well, that happens sometime (bad merge)
X-Git-Tag: v3_12~1004
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f254076b4fbb5c0dc8eb15d4834135566b9893bc?hp=c3890db8638c24b07758f57081aed4932379b5de

Well, that happens sometime (bad merge)
---

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 54e63ee7fb..38276ad50e 100644
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -6,18 +6,12 @@
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
 
-<<<<<<< HEAD
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 
-prefix="@exec_prefix@"
-smpicc="$prefix/bin/smpicc"
-smpif2c="$prefix/bin/smpif2c"
-=======
 F77=@GFORTRAN_EXE@
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
->>>>>>> 167177a9f2980982c1bb3f89ec90fc1937395cd5
 
 @SMPITOOLS_SH@