pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 20:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge issue

Browse Source
This commit is contained in:
Andrew Welker
2020-09-30 16:40:58 -06:00
parent 45ea5cc875
commit c7ccac2fe6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs
View File

@@ -22,6 +22,8 @@ namespace PepperDash.Essentials.Core
public static eDevicePlatform Platform { get { return CrestronEnvironment.DevicePlatform; } } public static eDevicePlatform Platform { get { return CrestronEnvironment.DevicePlatform; } }
public static Dictionary<short, EthernetAdapterInfo> EthernetAdapterInfoCollection { get; private set; }
public static LicenseManager LicenseManager { get; set; } public static LicenseManager LicenseManager { get; set; }
/// <summary> /// <summary>