fix merge issue

This commit is contained in:
Andrew Welker
2020-09-30 16:40:58 -06:00
parent 45ea5cc875
commit c7ccac2fe6

View File

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