From e60058ce92b59883da221d3e889ed62bd9b69c14 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 21 Aug 2012 22:50:28 -0400 Subject: remove committed conflicts in previous merge --- cloudinit/config/cc_ssh_authkey_fingerprints.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'cloudinit/config/cc_ssh_authkey_fingerprints.py') 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 -- cgit v1.2.3