From 43cea0ffbc481a87755d95df8b0fb2bb8dcb608e Mon Sep 17 00:00:00 2001
From: ribes <ribes>
Date: Tue, 19 Jan 2010 10:17:03 +0000
Subject: [PATCH] - Merger bug

---
 src/Container/SALOME_ContainerManager.hxx | 2 --
 1 file changed, 2 deletions(-)

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, 
-- 
2.39.2