diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-20 13:24:58 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-20 13:24:58 -0400 |
| commit | 543cf723ef83473c47d5ac90b5f77ce37d5dce7e (patch) | |
| tree | 3231419ef9c77d99df61d7bbdc2bcbcea92918bb | |
| parent | 7c7f05e6e21358f54779dce6bb2ecfeda813fd39 (diff) | |
fix merge conflict
| -rw-r--r-- | MediaBrowser.Api/Devices/DeviceService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Devices/DeviceService.cs b/MediaBrowser.Api/Devices/DeviceService.cs index 759eea353..6b280011a 100644 --- a/MediaBrowser.Api/Devices/DeviceService.cs +++ b/MediaBrowser.Api/Devices/DeviceService.cs @@ -158,4 +158,4 @@ namespace MediaBrowser.Api.Devices } } } -} +}
\ No newline at end of file |