From: Yulong <huangyulong@espressif.com>
Date: Mon, 18 Sep 2017 09:44:50 +0000 (-0400)
Subject: componnent/bt: remove the  <<<<<<< HEAD in the code.
X-Git-Tag: v3.1-dev~255^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=388bf8d5794ec02270d8fff3fcc6c9c52cd12bcb;p=esp-idf

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

diff --git a/components/bt/bluedroid/api/include/esp_gap_ble_api.h b/components/bt/bluedroid/api/include/esp_gap_ble_api.h
index 7d98fe11c1..62d5c9b098 100644
--- a/components/bt/bluedroid/api/include/esp_gap_ble_api.h
+++ b/components/bt/bluedroid/api/include/esp_gap_ble_api.h
@@ -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
  */
 esp_err_t esp_ble_gap_read_rssi(esp_bd_addr_t remote_addr);
-<<<<<<< HEAD
-    
-=======
 
-
-
-
->>>>>>> e14a214... squash the commit.
 #if (SMP_INCLUDED == TRUE)
 /**
 * @brief             Set a GAP security parameter value. Overrides the default value.