Resolving merge conflicting file

Ashok Rao · Ashok Rao · commit e6f772397c92 · 2020-07-21T14:09:01.000+01:00
diff --git a/platform/include/platform/mbed_version.h b/platform/include/platform/mbed_version.h
@@ -38,7 +38,7 @@
   *
   * @note 99 is default value for development version (master branch)
   */
-#define MBED_MINOR_VERSION 1
+#define MBED_MINOR_VERSION 2
 
 /** MBED_PATCH_VERSION
   * Mbed OS patch version
@@ -70,4 +70,4 @@
 #endif
 
 /** @}*/
-/** @}*/
+/** @}*/
