fix merge conflict

2015-09-20 13:24:58 -04:00 · 2015-09-20 13:24:58 -04:00 · 543cf723ef
parent 7c7f05e6e2
commit 543cf723ef
1 changed files with 1 additions and 1 deletions
--- a/MediaBrowser.Api/Devices/DeviceService.cs
+++ b/MediaBrowser.Api/Devices/DeviceService.cs
@ -158,4 +158,4 @@ namespace MediaBrowser.Api.Devices
            }
        }
    }
-}
+}