From: degomme <augustin.degomme@unibas.ch>
Date: Tue, 14 Mar 2017 23:31:27 +0000 (+0100)
Subject: bad merge
X-Git-Tag: v3_15~113
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2d946d78f32cc1b00d0b17aa1e3960cef0fa6535

bad merge
---

diff --git a/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp b/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
index ed96d6f7f0..c77f125b37 100644
--- a/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
+++ b/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
@@ -21,8 +21,8 @@
  * Additional copyrights may follow
  */
 
-#include "colls_private.h"
-#include "coll_tuned_topo.h"
+#include "../colls_private.h"
+#include "../coll_tuned_topo.h"
 
 /*
  * Recursive-halving function is (*mostly*) copied from the BASIC coll module.