Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio

# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs

1 files changed, 1 insertions, 12 deletions

diff --git a/RSSDP/SsdpEmbeddedDevice.cs b/RSSDP/SsdpEmbeddedDevice.cs
index 4810703d7..f1a598111 100644
--- a/RSSDP/SsdpEmbeddedDevice.cs
+++ b/RSSDP/SsdpEmbeddedDevice.cs
@@ -5,14 +5,8 @@ namespace Rssdp
     /// </summary>
     public class SsdpEmbeddedDevice : SsdpDevice
     {
-
-        #region Fields
         private SsdpRootDevice _RootDevice;
 
-        #endregion
-
-        #region Constructors
-
         /// <summary>
         /// Default constructor.
         /// </summary>
@@ -20,10 +14,6 @@ namespace Rssdp
         {
         }
 
-        #endregion
-
-        #region Public Properties
-
         /// <summary>
         /// Returns the <see cref="SsdpRootDevice"/> that is this device's first ancestor. If this device is itself an <see cref="SsdpRootDevice"/>, then returns a reference to itself.
         /// </summary>
@@ -33,6 +23,7 @@ namespace Rssdp
             {
                 return _RootDevice;
             }
+
             internal set
             {
                 _RootDevice = value;
@@ -45,7 +36,5 @@ namespace Rssdp
                 }
             }
         }
-
-        #endregion
     }
 }