From c7ccac2fe6e96b0341954c71999554472d79199a Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Wed, 30 Sep 2020 16:40:58 -0600
Subject: [PATCH] fix merge issue

---
 .../Essentials Core/PepperDashEssentialsBase/Global/Global.cs   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs
index f0a71436..4a846df7 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs	
@@ -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>