From 55fe7129a09cf7afea6c403a0e737d2e0d8a6be0 Mon Sep 17 00:00:00 2001
From: Cruz Monrreal II <Cruz.Monrreal@arm.com>
Date: Fri, 28 Dec 2018 14:09:10 -0600
Subject: [PATCH] Correct improper merge resolution. NUMAKER_PFM_NUC472 does
 not have ANALOGOUT enabled

---
 targets/targets.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/targets.json b/targets/targets.json
index 9bceffee74..417d3c3ba1 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -6863,7 +6863,6 @@
             "LPTICKER",
             "RTC",
             "ANALOGIN",
-            "ANALOGOUT",
             "I2C",
             "I2CSLAVE",
             "I2C_ASYNCH",