From 543cf723ef83473c47d5ac90b5f77ce37d5dce7e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 20 Sep 2015 13:24:58 -0400
Subject: [PATCH] fix merge conflict

---
 MediaBrowser.Api/Devices/DeviceService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Api/Devices/DeviceService.cs b/MediaBrowser.Api/Devices/DeviceService.cs
index 759eea3537..6b280011a6 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