diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-10-14 02:55:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-14 02:55:15 -0400 |
| commit | c8244f4687cb26ec1b541767b1ff59fcabbfbdb1 (patch) | |
| tree | f4eb0dfc9d9cd84f551dd445683c44497b623c14 /MediaBrowser.Model/Devices | |
| parent | 7619ff7db543df3d8228aa87aa82a544e8dda54f (diff) | |
| parent | f8a3701bb515dae6be7d8b23bf83c4ce7aac8aa1 (diff) | |
Merge pull request #2952 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model/Devices')
| -rw-r--r-- | MediaBrowser.Model/Devices/DeviceInfo.cs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/MediaBrowser.Model/Devices/DeviceInfo.cs b/MediaBrowser.Model/Devices/DeviceInfo.cs index d8358977e..d2ee3fdcc 100644 --- a/MediaBrowser.Model/Devices/DeviceInfo.cs +++ b/MediaBrowser.Model/Devices/DeviceInfo.cs @@ -21,17 +21,7 @@ namespace MediaBrowser.Model.Devices /// <value>The camera upload path.</value> public string CameraUploadPath { get; set; } - /// <summary> - /// Gets the name. - /// </summary> - /// <value>The name.</value> - public string Name - { - get - { - return string.IsNullOrEmpty(CustomName) ? ReportedName : CustomName; - } - } + public string Name { get; set; } /// <summary> /// Gets or sets the identifier. |