diff options
| -rw-r--r-- | paramiko/ber.py | 5 | ||||
| -rw-r--r-- | paramiko/py3compat.py | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/paramiko/ber.py b/paramiko/ber.py index af4e2138..05152303 100644 --- a/paramiko/ber.py +++ b/paramiko/ber.py @@ -128,11 +128,6 @@ class BER(object): def encode_sequence(data): ber = BER() for item in data: -<<<<<<< HEAD - b.encode(item) - return b.asbytes() -======= ber.encode(item) return ber.asbytes() ->>>>>>> master encode_sequence = staticmethod(encode_sequence) diff --git a/paramiko/py3compat.py b/paramiko/py3compat.py index 2fae079b..8842b988 100644 --- a/paramiko/py3compat.py +++ b/paramiko/py3compat.py @@ -113,13 +113,9 @@ else: return s def byte_ord(c): -<<<<<<< HEAD - assert isinstance(c, int) -======= # In case we're handed a string instead of an int. if not isinstance(c, int): c = ord(c) ->>>>>>> master return c def byte_chr(c): |