Исправление объединения веток

client/client.py

@@ -41,7 +41,7 @@ from calculate.lib.utils.files import (getModeFile, removeDir,
                                        sambaPasswordCheck,checkUtils)
 from calculate.lib.utils.common import (getpathenv, appendProgramToEnvFile,
                                         removeProgramToEnvFile)
-from _cl_keys import getKey, clearKey
+from calculate.desktop._cl_keys import getKey, clearKey
 from calculate.lib.convertenv import convertEnv
 from calculate.lib.encrypt import encrypt
 from client_cache import userCache

setup.py

@@ -71,14 +71,9 @@ def create_data_files(data_dirs, prefix="", replace_dirname=""):
 class cl_install_data(install_data):
     def run(self):
         install_data.run(self)
-<<<<<<< HEAD
-        data_file = [("/etc/init.d/client", 0755),
-                     ("/usr/share/calculate/xdm/wait_domain", 0755)]
-=======
         data_file = [("/etc/init.d/client",0755),
                      ("/usr/sbin/logout",0755),
                      ("/usr/share/calculate/xdm/wait_domain",0755)]
->>>>>>> origin/master
         fileNames = map(lambda x: os.path.split(x[0])[1], data_file)
         listNames = map(lambda x: filter(lambda y: y, x[0].split("/")),
                         data_file)