Andrea Sortino / X_NUCLEO_IDB0XA1

Dependents:   BLE_GENERALE

Fork of X_NUCLEO_IDB0XA1 by ST

Files at this revision

API Documentation at this revision

Comitter:
Andrea Palmieri
Date:
Mon Jun 20 15:11:41 2016 +0200
Parent:
242:058b2e731adc
Child:
247:932a44bdff4f
Commit message:
Get rid of unmerged line

Signed-off-by: Andrea Palmieri <andrea.palmieri@st.com>

Changed in this revision

source/BlueNRGGattClient.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/source/BlueNRGGattClient.cpp	Mon Jun 20 14:59:06 2016 +0200
+++ b/source/BlueNRGGattClient.cpp	Mon Jun 20 15:11:41 2016 +0200
@@ -813,4 +813,3 @@
   return BLE_ERROR_NONE;
 }
 
->>>>>>> master