diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-10-24 01:20:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 01:20:09 -0400 |
| commit | 0aac8045fb69ad1024859812a09e68070ea698f6 (patch) | |
| tree | 6e8b55133b0eeee606df5049497b80a612843733 /MediaBrowser.Model/Devices/DeviceInfo.cs | |
| parent | 7924bb7c9add449f61d8695add6f2f3fcbc18a0a (diff) | |
| parent | 6c5f3ce07e8b36299a4143dc609999d880e7bdfd (diff) | |
Merge pull request #2974 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.Model/Devices/DeviceInfo.cs')
| -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. |