Well, that happens sometime (bad merge)

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 54e63ee..38276ad 100644 (file)
--- 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.
 
 # 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@"
 
 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@"
 F77=@GFORTRAN_EXE@
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"

->>>>>>> 167177a9f2980982c1bb3f89ec90fc1937395cd5

 
 @SMPITOOLS_SH@
 
 
 @SMPITOOLS_SH@