fix(BLE): Fix build error in OTAS Example (#1071)

Co-authored-by: EricB-ADI <[email protected]>
analogdevicesinc · Jul 2, 2024 · 4d53dd0 · 4d53dd0
1 parent 9b935d9
commit 4d53dd0
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c b/Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c
@@ -450,11 +450,8 @@ static void datsSetup(dmEvt_t *pMsg)
 {
     /* Initialize control information */
     datsCb.restoringResList = FALSE;
-    < < < < < < < < <
-        Temporary merge branch 1 memcpy(&datsScanDataDisc[2], deviceName, sizeof(deviceName));
-    datsScanDataDisc[0] = sizeof(deviceName);
-    datsScanDataDisc[1] = DM_ADV_TYPE_LOCAL_NAME;
-    == == == == = memcpy(&datsScanDataDisc[2], deviceName, sizeof(deviceName));
+
+    memcpy(&datsScanDataDisc[2], deviceName, sizeof(deviceName));
     datsScanDataDisc[0] = sizeof(deviceName);
     datsScanDataDisc[1] = DM_ADV_TYPE_LOCAL_NAME;