fix merge conflict

2025-05-04 11:32:25 -07:00
parent 9f1e95d87f
commit ce04c163db
3 changed files with 30 additions and 9 deletions
--- a/bumble/hci.py
+++ b/bumble/hci.py
@@ -29,13 +29,12 @@ from typing_extensions import Self
 from bumble import crypto
 from bumble.colors import color
 from bumble.core import (
-    PhysicalTransport,
    AdvertisingData,
    DeviceClass,
    InvalidArgumentError,
    InvalidPacketError,
-    ProtocolError,
    PhysicalTransport,
+    ProtocolError,
    bit_flags_to_strings,
    name_or_number,
    padded_bytes,