ged

5 years ago · fa7ccf6fd7
parent f3c0d084bd
commit fa7ccf6fd7
1 changed files with 5 additions and 0 deletions
--- a/bridge_master.py
+++ b/bridge_master.py
@ -1796,6 +1796,11 @@ class routerHBP(HBSYSTEM):
                        return
            
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+=======
+            _int_seq = _seq.decode()
+            _int_seq = int(_int_seq)
+>>>>>>> Stashed changes
 =======
            _int_seq = _seq.decode()
            _int_seq = int(_int_seq)