From: ageay <ageay>
Date: Mon, 18 Jul 2011 06:38:19 +0000 (+0000)
Subject: Correction of merge errors.
X-Git-Tag: V6_main_FINAL~1004
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=97db014922b9bf7a1f552e210fd34e710d95bc85;p=tools%2Fmedcoupling.git

Correction of merge errors.
---

diff --git a/src/ParaMEDMEM/OverlapElementLocator.cxx b/src/ParaMEDMEM/OverlapElementLocator.cxx
index eac39033d..9262c3602 100644
--- 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 7e3e888d6..5ffa58fc8 100644
--- a/src/ParaMEDMEM/OverlapElementLocator.hxx
+++ b/src/ParaMEDMEM/OverlapElementLocator.hxx
@@ -30,7 +30,6 @@
 #include <vector>
 #include <map>
 #include <set>
-#include <map>
 
 namespace ParaMEDMEM
 {