Updating mbed-os to mbed-os-5.11.0-rc4

Cruz Monrreal II · Patater · commit e499e858c3f6 · 2018-12-19T14:13:38.000Z
diff --git a/mbed-os.lib b/mbed-os.lib
@@ -1 +1,7 @@
+<<<<<<< HEAD
 https://github.com/mohammad1603/mbed-os/#606cf41ba383c4ea5673082b536848fa5b4e0dbe
+||||||| parent of dcce5775fb29... Updating mbed-os to mbed-os-5.11.0-rc4
+https://github.com/ARMmbed/mbed-os/#2994c3f7dbf6ae11ef3b12404609fadde69c4e2f
+=======
+https://github.com/ARMmbed/mbed-os/#6a0a86538c0b9b2bfcc4583b1e2b7fea8f4e71e9
+>>>>>>> dcce5775fb29... Updating mbed-os to mbed-os-5.11.0-rc4
