starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-26 10:44:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Luke Pulverenti
2015-09-20 13:24:58 -04:00
parent 7c7f05e6e2
commit 543cf723ef
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Devices/DeviceService.cs
View File

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