resolve merge conflicts

This commit is contained in:
Gilles Boccon-Gibod
2025-07-26 21:20:52 -07:00
parent cce2e4d4e3
commit d611d25802
66 changed files with 180 additions and 232 deletions

View File

@@ -16,9 +16,8 @@
# Imports
# -----------------------------------------------------------------------------
import asyncio
import logging
import sys
import os
from bumble.device import (
AdvertisingParameters,
AdvertisingEventProperties,
@@ -26,8 +25,8 @@ from bumble.device import (
Device,
)
from bumble.hci import Address
from bumble.transport import open_transport
import bumble.logging
# -----------------------------------------------------------------------------
@@ -69,5 +68,5 @@ async def main() -> None:
# -----------------------------------------------------------------------------
logging.basicConfig(level=os.environ.get('BUMBLE_LOGLEVEL', 'DEBUG').upper())
bumble.logging.setup_basic_logging('DEBUG')
asyncio.run(main())