From 6174400b7e447a80e48c20ba93f99cb5c4a3ec9e Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Fri, 27 Oct 2023 15:13:46 -0600 Subject: [PATCH] Updates merge to ignore uid and merge on key only for devices --- src/Pepperdash Core/Config/PortalConfigReader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pepperdash Core/Config/PortalConfigReader.cs b/src/Pepperdash Core/Config/PortalConfigReader.cs index 803875f..fdc9040 100644 --- a/src/Pepperdash Core/Config/PortalConfigReader.cs +++ b/src/Pepperdash Core/Config/PortalConfigReader.cs @@ -85,7 +85,7 @@ namespace PepperDash.Core.Config merged.Add("info", template["info"]); merged.Add("devices", MergeArraysOnTopLevelProperty(template["devices"] as JArray, - system["devices"] as JArray, "uid", "devices")); + system["devices"] as JArray, "key", "devices")); if (system["rooms"] == null) merged.Add("rooms", template["rooms"]);