Fix problem of bad merge

diff --git a/bin/killSalome.py b/bin/killSalome.py
index 0c22df0c02f0ef05df21c5cf1a7a62c8be067ab2..3ee4d196c76ef3bea42ca4afe2da81f52778c17e 100755 (executable)
--- a/bin/killSalome.py
+++ b/bin/killSalome.py
@@ -95,7 +95,7 @@ def killAllPorts():
 
 if __name__ == "__main__":
     try:
-        from salomeLauncherUtils import setOmniOrbUserPath
+        from salomeContextUtils import setOmniOrbUserPath
         setOmniOrbUserPath()
     except Exception, e:
         print e

diff --git a/bin/killSalomeWithPort.py b/bin/killSalomeWithPort.py
index c28fba52a5496365830c1e955a234bfa4ab6f992..040a27f4e460bf4de11a9dcbb1614020d468f6dc 100755 (executable)
--- a/bin/killSalomeWithPort.py
+++ b/bin/killSalomeWithPort.py
@@ -408,7 +408,7 @@ if __name__ == "__main__":
         sys.exit(0)
         pass
     try:
-        from salomeLauncherUtils import setOmniOrbUserPath
+        from salomeContextUtils import setOmniOrbUserPath
         setOmniOrbUserPath()
     except Exception, e:
         print e