Home Explore Help
Sign In
mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

fix merge conflict

Luke Pulverenti 9 years ago
parent
7c7f05e6e2
commit
543cf723ef
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      MediaBrowser.Api/Devices/DeviceService.cs

+ 1 - 1
MediaBrowser.Api/Devices/DeviceService.cs
View File 

@@ -158,4 +158,4 @@ namespace MediaBrowser.Api.Devices
 
             }
 
         }
 
     }
 
-}
 
+}