Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-21 22:40:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Luke Pulverenti 2016-07-23 16:12:52 -04:00
parent 352ff3b212
commit d661f690f5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Dlna/DlnaService.cs
View File

@ -34,8 +34,6 @@ namespace MediaBrowser.Api.Dlna
[Route("/Dlna/Profiles/{Id}", "POST", Summary = "Updates a profile")] [Route("/Dlna/Profiles/{Id}", "POST", Summary = "Updates a profile")]
public class UpdateProfile : DeviceProfile, IReturnVoid public class UpdateProfile : DeviceProfile, IReturnVoid
{ {
[ApiMember(Name = "Id", Description = "Profile Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
public string Id { get; set; }
} }
[Route("/Dlna/Profiles", "POST", Summary = "Creates a profile")] [Route("/Dlna/Profiles", "POST", Summary = "Creates a profile")]

2
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.1.*")] //[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.0.5991")] [assembly: AssemblyVersion("3.1.75")]