From 86732861000fb3affc7568042948af199847611e Mon Sep 17 00:00:00 2001
From: Ganesh Ramachandran <rganesh@TOSHIBA-TSIP.COM>
Date: Thu, 19 Jul 2018 16:32:51 +0530
Subject: [PATCH] Resolved conflict in targets/targets.json

---
 targets/targets.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/targets/targets.json b/targets/targets.json
index ddfc5ab4bc..ac5ee1df6a 100755
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -4303,5 +4303,17 @@
         "release_versions": ["5"],
         "device_name": "M2351KIAAEES",
         "bootloader_supported": true
+    },
+    "TMPM3H6": {
+        "inherits": ["Target"],
+        "core": "Cortex-M3",
+        "is_disk_virtual": true,
+        "extra_labels": ["TOSHIBA"],
+        "macros": ["__TMPM3H6__"],
+        "supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
+        "device_has": ["USTICKER", "ANALOGIN", "ANALOGOUT", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "I2C", "I2CSLAVE", "STDIO_MESSAGES"],
+        "device_name": "TMPM3H6FWFG",
+        "detect_code": ["7012"],
+        "release_versions": ["5"]
     }
 }