Resolve conflicts

Donatien Garnier · Donatien Garnier · commit 2912b6a8dec9 · 2018-05-25T11:21:26.000-05:00
diff --git a/BLE_BatteryLevel/mbed-os.lib b/BLE_BatteryLevel/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#ae6c7c60f91c89cbf755a2f3c8ec9c66635849fd
+https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36
diff --git a/BLE_Beacon/mbed-os.lib b/BLE_Beacon/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#ae6c7c60f91c89cbf755a2f3c8ec9c66635849fd
+https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36
diff --git a/BLE_Button/mbed-os.lib b/BLE_Button/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#ae6c7c60f91c89cbf755a2f3c8ec9c66635849fd
+https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36
diff --git a/BLE_GAPButton/mbed-os.lib b/BLE_GAPButton/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#ae6c7c60f91c89cbf755a2f3c8ec9c66635849fd
+https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36
diff --git a/BLE_HeartRate/mbed-os.lib b/BLE_HeartRate/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#ae6c7c60f91c89cbf755a2f3c8ec9c66635849fd
+https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36
diff --git a/BLE_LED/mbed-os.lib b/BLE_LED/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#ae6c7c60f91c89cbf755a2f3c8ec9c66635849fd
+https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36
diff --git a/BLE_LEDBlinker/mbed-os.lib b/BLE_LEDBlinker/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#ae6c7c60f91c89cbf755a2f3c8ec9c66635849fd
+https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36
diff --git a/BLE_Thermometer/mbed-os.lib b/BLE_Thermometer/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#ae6c7c60f91c89cbf755a2f3c8ec9c66635849fd
+https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-https://github.com/ARMmbed/mbed-os/#ae6c7c60f91c89cbf755a2f3c8ec9c66635849fd`
	`1`	`+https://github.com/ARMmbed/mbed-os/#367dbdf5145f4d6aa3e483c147fe7bda1ce23a36`