合并解决冲突
authordxy <1731678236@qq.com>
Thu, 28 Mar 2024 02:50:49 +0000 (10:50 +0800)
committerdxy <1731678236@qq.com>
Thu, 28 Mar 2024 02:50:49 +0000 (10:50 +0800)
commit19e4c06f0dab576c99140eadd2c510489636359c
tree0b6d446dfd109f41e4a99f1a62cb15f10352c7d9
parentc098b435110657a06aa609c61c1459bac0b31712
parent329ec5dadcafd64cfde8acd9ab2721409fedfd67
合并解决冲突
code/sdk/application/wearable/service/ble_service/bleService.c
code/sdk/build/config/target_config/brandy/config.py