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: correct minor leftover merge issues

Browse Source
This commit is contained in:
Andrew Welker
2023-10-26 23:24:01 -05:00
parent 8537630e03
commit 8f510a6243
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs
View File

@@ -1,4 +1,6 @@
extern alias Full; extern alias Full;
using Crestron.SimplSharp;
using Crestron.SimplSharp.Reflection; using Crestron.SimplSharp.Reflection;
using Full.Newtonsoft.Json.Linq; using Full.Newtonsoft.Json.Linq;
using PepperDash.Core; using PepperDash.Core;

6
src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs
View File

@@ -1,6 +1,4 @@
extern alias Full; using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@@ -13,8 +11,6 @@ using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Core.Devices;
using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Core.DeviceTypeInterfaces;
using Full.Newtonsoft.Json;
namespace PepperDash.Essentials.Core namespace PepperDash.Essentials.Core
{ {
/// <summary> /// <summary>