mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-04-12 20:17:03 +00:00
# Conflicts: # PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs # essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/RoutingPort.cs |
||
|---|---|---|
| .. | ||
| EssentialsDualDisplayRoom.cs | ||
| EssentialsHuddleSpaceRoom.cs | ||
| EssentialsHuddleSpaceRoom.cs.orig | ||
| EssentialsHuddleVtc1Room.cs | ||
| EssentialsHuddleVtc1Room.cs.orig | ||
| EssentialsNDisplayRoomBase.cs | ||
| EssentialsPresentationRoom.cs | ||