diff options
| -rw-r--r-- | cloudinit/config/cc_ssh_authkey_fingerprints.py | 5 |
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 |