Merge conflict

12 years ago · 03f1578768
parent 69ff91505c
commit 03f1578768
1 changed files with 0 additions and 6 deletions
--- a/packaging/apt_key
+++ b/packaging/apt_key
@ -129,15 +129,9 @@ def download_key(module, url):
        module.fail_json(msg="error getting key id from url", traceback=format_exc())


-<<<<<<< HEAD
 def add_key(module, key):
    cmd = "apt-key add -"
    (rc, out, err) = module.run_command(cmd, data=key, check_rc=True, binary_data=True)
-=======
-def add_key(module, key, data=None):
-    cmd = "apt-key add %s" % (key)
-    (rc, out, err) = module.run_command(cmd, data=data, check_rc=True)
->>>>>>> 77159d21da40f6fcb0bfdcb1886f57acf68ea4f4
    return True

 def remove_key(module, key_id):