From ace0613a210d15133f1c1b3a2f12e5acd1762dae Mon Sep 17 00:00:00 2001 From: Ryan Adolf Date: Fri, 20 Jun 2025 00:01:23 -0400 Subject: [PATCH] refactor: Fix merge conflict --- app/include/zmk/ble.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/include/zmk/ble.h b/app/include/zmk/ble.h index 95f0bbfb1..3e734aa82 100644 --- a/app/include/zmk/ble.h +++ b/app/include/zmk/ble.h @@ -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);