Correct improper merge resolution.

Cruz Monrreal II · Cruz Monrreal II · commit 55fe7129a09c · 2018-12-28T14:09:10.000-06:00
NUMAKER_PFM_NUC472 does not have ANALOGOUT enabled
diff --git a/targets/targets.json b/targets/targets.json
@@ -6863,7 +6863,6 @@
             "LPTICKER",
             "RTC",
             "ANALOGIN",
-            "ANALOGOUT",
             "I2C",
             "I2CSLAVE",
             "I2C_ASYNCH",
