summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_ssh_authkey_fingerprints.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-08-21 22:50:28 -0400
committerScott Moser <smoser@ubuntu.com>2012-08-21 22:50:28 -0400
commite60058ce92b59883da221d3e889ed62bd9b69c14 (patch)
treef4ab027d7098353a1da127a099e81832e9f4729e /cloudinit/config/cc_ssh_authkey_fingerprints.py
parente65604ca64e16c4ee5bf2467c4424954eddfc390 (diff)
downloadvyos-cloud-init-e60058ce92b59883da221d3e889ed62bd9b69c14.tar.gz
vyos-cloud-init-e60058ce92b59883da221d3e889ed62bd9b69c14.zip
remove committed conflicts in previous merge
Diffstat (limited to 'cloudinit/config/cc_ssh_authkey_fingerprints.py')
-rw-r--r--cloudinit/config/cc_ssh_authkey_fingerprints.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/cloudinit/config/cc_ssh_authkey_fingerprints.py b/cloudinit/config/cc_ssh_authkey_fingerprints.py
index ebd9d6c8..68684c3d 100644
--- a/cloudinit/config/cc_ssh_authkey_fingerprints.py
+++ b/cloudinit/config/cc_ssh_authkey_fingerprints.py
@@ -27,13 +27,8 @@ from cloudinit import util
def _split_hash(bin_hash):
split_up = []
-<<<<<<< TREE
- for i in xrange(0, len(bin_hash), FP_SEGMENT_LEN):
- split_up.append(bin_hash[i:i + FP_SEGMENT_LEN])
-=======
for i in xrange(0, len(bin_hash), 2):
split_up.append(bin_hash[i:i+2])
->>>>>>> MERGE-SOURCE
return split_up