espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 21:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_8997' into 'master'

Browse Source 
Clean up botched merge (GitHub PR)

Closes IDFGH-7419

See merge request espressif/esp-idf!18199
This commit is contained in:
morris
2022-05-23 14:41:26 +08:00
parent 2d84985baa 34369cd709
commit 3b2f8dfc0d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/bluetooth/blufi/README.md
View File

@@ -81,8 +81,4 @@ I (1198) BLUFI_EXAMPLE: BLUFI init finish
## Troubleshooting ## Troubleshooting
<<<<<<< HEAD:examples/bluetooth/blufi/README.md
* [Bluetooth Network User Guide CN](https://www.espressif.com/sites/default/files/documentation/esp32_bluetooth_networking_user_guide_cn.pdf)
=======
For any technical queries, please open an [issue](https://github.com/espressif/esp-idf/issues) on GitHub. We will get back to you soon. For any technical queries, please open an [issue](https://github.com/espressif/esp-idf/issues) on GitHub. We will get back to you soon.
>>>>>>> c552024ca7 (Changes on README files on ANCS, Eddystone, HID and NimBLE):examples/bluetooth/bluedroid/ble/blufi/README.md