From a13428fb4e6e1cd82e898320cde03b2ea08b151d Mon Sep 17 00:00:00 2001 From: Jason T Alborough Date: Tue, 14 Aug 2018 09:45:41 -0400 Subject: [PATCH] Commented out a read-only property. Merge Issue mabey --- PepperDashEssentials/Room/Cotija/CotijaSystemController.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs b/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs index ab06a774..fc7d8212 100644 --- a/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs +++ b/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs @@ -258,7 +258,10 @@ namespace PepperDash.Essentials confObject.Info.RuntimeInfo.AppName = Assembly.GetExecutingAssembly().GetName().Name; var version = Assembly.GetExecutingAssembly().GetName().Version; confObject.Info.RuntimeInfo.AssemblyVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build); - confObject.Info.RuntimeInfo.OsVersion = Crestron.SimplSharp.CrestronEnvironment.OSVersion.Firmware; + + +# warning I commented this out...read only property...Bad merge? JTA 2018-08-13 ; + //confObject.Info.RuntimeInfo.OsVersion = Crestron.SimplSharp.CrestronEnvironment.OSVersion.Firmware; string postBody = JsonConvert.SerializeObject(confObject); SystemUuid = confObject.SystemUuid;