github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 22:17:25 -04:00
Code Issues Projects Releases Packages 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
}
}
}
}
}