Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

componnent/bt: remove the <<<<<<< HEAD in the code.

Browse source
This commit is contained in:
Yulong 2017-09-18 05:44:50 -04:00
parent 8925a90d40
commit 388bf8d579
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/bt/bluedroid/api/include/esp_gap_ble_api.h
View file

@ -859,14 +859,7 @@ esp_err_t esp_ble_gap_config_scan_rsp_data_raw(uint8_t *raw_data, uint32_t raw_d
* - other : failed * - other : failed
*/ */
esp_err_t esp_ble_gap_read_rssi(esp_bd_addr_t remote_addr); esp_err_t esp_ble_gap_read_rssi(esp_bd_addr_t remote_addr);
<<<<<<< HEAD
=======
>>>>>>> e14a214... squash the commit.
#if (SMP_INCLUDED == TRUE) #if (SMP_INCLUDED == TRUE)
/** /**
* @brief Set a GAP security parameter value. Overrides the default value. * @brief Set a GAP security parameter value. Overrides the default value.