zmkfirmware
/
zmk
mirror of https://github.com/zmkfirmware/zmk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Fix merge conflict

This commit is contained in:
Ryan Adolf 2025-06-20 00:01:23 -04:00
parent d6b3707dde
commit ace0613a21
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/include/zmk/ble.h
View File

@ -30,7 +30,6 @@ int zmk_ble_active_profile_index(void);
int zmk_ble_profile_index(const bt_addr_le_t *addr);
bt_addr_le_t *zmk_ble_profile_address(uint8_t index);
<<<<<<< HEAD
bt_addr_le_t *zmk_ble_active_profile_addr(void);
struct bt_conn *zmk_ble_active_profile_conn(void);
@ -41,12 +40,9 @@ bool zmk_ble_active_profile_is_open(void);
bool zmk_ble_active_profile_is_connected(void);
char *zmk_ble_active_profile_name(void);
int zmk_ble_unpair_all(void);
void zmk_ble_unpair_all(void);
int zmk_ble_set_device_name(char *name);
=======
void zmk_ble_unpair_all(void);
>>>>>>> c072f755 (refactor: Add a settings reset function)
#if IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
int zmk_ble_put_peripheral_addr(const bt_addr_le_t *addr);