Add double read/write example

Author: sgbihu

libraries/CurieBLE/examples/central/CentralDouble/CentralDouble.ino

@@ -1,4 +1,5 @@
 /*
+<<<<<<< HEAD
  * Copyright (c) 2016 Intel Corporation.  All rights reserved.
  * See the bottom of this file for the license terms.
  */
@@ -19,6 +20,25 @@
  *  Expected Peripheral Characteristic: 19b20001e8f2537e4f6cd104768a1214
  *  Expected Characteristic read value:  double.
  */
+=======
+  Arduino BLE Peripheral Double read/write test example
+  Copyright (c) 2016 Arduino LLC. All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+>>>>>>> 767fe14... Add double read/write example
 
 #include "CurieBLE.h"
 
@@ -102,6 +122,7 @@ void controlLogic(BLEDevice &peripheral)
     Serial.println(peripheral.address());
 }
 
+<<<<<<< HEAD
 
 
 /*
@@ -124,3 +145,5 @@ void controlLogic(BLEDevice &peripheral)
 */
 
 
+=======
+>>>>>>> 767fe14... Add double read/write example

libraries/CurieBLE/examples/peripheral/PeripheralDouble/PeripheralDouble.ino

@@ -1,4 +1,5 @@
 /*
+<<<<<<< HEAD
  * Copyright (c) 2016 Intel Corporation.  All rights reserved.
  * See the bottom of this file for the license terms.
  */
@@ -14,6 +15,25 @@
  *
  *  - Peripheral Characteristic:  19b20001e8f2537e4f6cd104768a1214
  */
+=======
+  Arduino BLE Peripheral Double read/write test example
+  Copyright (c) 2016 Arduino LLC. All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+>>>>>>> 767fe14... Add double read/write example
 
 #include <CurieBLE.h>
 
@@ -72,6 +92,7 @@ void loop() {
   }
 }
 
+<<<<<<< HEAD
 
 /*
   Arduino BLE Peripheral Double read/write test example
@@ -93,3 +114,5 @@ void loop() {
 */
 
 
+=======
+>>>>>>> 767fe14... Add double read/write example