- Merger bug

diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx
index 89fa303fab7103d8e52292dff84bcb6a990f0662..0caeaafcbb3ba710a73aa0b1eea7fdd287966f4e 100644 (file)
--- 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,