From: ribes <ribes>
Date: Tue, 19 Jan 2010 10:17:03 +0000 (+0000)
Subject: - Merger bug
X-Git-Tag: PARAVIS_29012010~13
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=43cea0ffbc481a87755d95df8b0fb2bb8dcb608e;p=modules%2Fkernel.git

- Merger bug
---

diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx
index 89fa303fa..0caeaafcb 100644
--- a/src/Container/SALOME_ContainerManager.hxx
+++ b/src/Container/SALOME_ContainerManager.hxx
@@ -91,8 +91,6 @@ protected:
 
   std::string machinesFile(const int nbproc);
 
-  void machinesFile(const int nbproc);
-
   // For PacO++ Parallel extension
   typedef std::vector<std::string> actual_launch_machine_t;
   std::string BuildCommandToLaunchParallelContainer(const std::string& exe_name,