From f9cdce14d490edad7e52f18c38780f76a8b37d85 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 11 Apr 2014 16:49:55 +0400 Subject: [PATCH] Fix problem of bad merge --- bin/killSalome.py | 2 +- bin/killSalomeWithPort.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/killSalome.py b/bin/killSalome.py index 0c22df0c0..3ee4d196c 100755 --- 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 c28fba52a..040a27f4e 100755 --- 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 -- 2.39.2