From 31b63b033ba8c6a3438b699b21b2a8c5156ccae9 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael@ansibleworks.com>
Date: Tue, 18 Jun 2013 20:18:17 -0400
Subject: [PATCH] Merge conflict

---
 library/packaging/apt_key | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/library/packaging/apt_key b/library/packaging/apt_key
index 25c90b7100..9106a09fd0 100644
--- a/library/packaging/apt_key
+++ b/library/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):