From 2672104d9bc74ed6afbf08eeb1aa071d314c35b9 Mon Sep 17 00:00:00 2001
From: secher <secher>
Date: Mon, 29 Sep 2008 09:29:48 +0000
Subject: [PATCH] correct conflict

---
 bin/shutdownSalome.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/shutdownSalome.py b/bin/shutdownSalome.py
index 491266662..9f9cd6d80 100755
--- a/bin/shutdownSalome.py
+++ b/bin/shutdownSalome.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
+import time
 import salome
 salome.salome_init()
 salome.lcc.shutdownServers()
-salome.SALOME_LifeCycleCORBA_killOmniNames()
+#give some time to shutdown to complete
+time.sleep(1)
+salome.LifeCycleCORBA.killOmniNames()
-- 
2.39.2