Correction of merge errors.

diff --git a/src/ParaMEDMEM/OverlapElementLocator.cxx b/src/ParaMEDMEM/OverlapElementLocator.cxx
index eac39033d6e49d0ceaaef5cd35ba40a6bdda0c9f..9262c36025a1917ae808971f4bb86961cce86ded 100644 (file)
--- a/src/ParaMEDMEM/OverlapElementLocator.cxx
+++ b/src/ParaMEDMEM/OverlapElementLocator.cxx
@@ -19,7 +19,6 @@
 
 #include "OverlapElementLocator.hxx"
 
-#include <mpi.h>
 #include "CommInterface.hxx"
 #include "Topology.hxx"
 #include "BlockTopology.hxx"
@@ -33,8 +32,6 @@
 #include "DirectedBoundingBox.hxx"
 #include "InterpKernelAutoPtr.hxx"
 
-#include <map>
-#include <set>
 #include <limits>
 
 using namespace std;

diff --git a/src/ParaMEDMEM/OverlapElementLocator.hxx b/src/ParaMEDMEM/OverlapElementLocator.hxx
index 7e3e888d6ab708dd7e47e621be1b84454ebcc6a3..5ffa58fc8e06610c42f6db457072394659faf75e 100644 (file)
--- a/src/ParaMEDMEM/OverlapElementLocator.hxx
+++ b/src/ParaMEDMEM/OverlapElementLocator.hxx
@@ -30,7 +30,6 @@
 #include <vector>
 #include <map>
 #include <set>
-#include <map>
 
 namespace ParaMEDMEM
 {