From f254076b4fbb5c0dc8eb15d4834135566b9893bc Mon Sep 17 00:00:00 2001
From: scastelli <stephane.castelli@inria.fr>
Date: Wed, 4 Jun 2014 20:32:59 +0200
Subject: [PATCH] Well, that happens sometime (bad merge)

---
 src/smpi/smpiff.in | 6 ------
 1 file changed, 6 deletions(-)

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@
 
-- 
2.20.1