diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-23 16:12:52 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-23 16:12:52 -0400 |
| commit | d661f690f58cd05be86843d2c7c8a2984c66c2f6 (patch) | |
| tree | 1eb3a9885782512ddf29e215dd69981699c2edeb | |
| parent | 352ff3b212c435e6b407df2f985fd9f3ef39215c (diff) | |
fix merge conflicts
| -rw-r--r-- | MediaBrowser.Api/Dlna/DlnaService.cs | 4 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/MediaBrowser.Api/Dlna/DlnaService.cs b/MediaBrowser.Api/Dlna/DlnaService.cs index 92ef8722e..dd4b59b92 100644 --- a/MediaBrowser.Api/Dlna/DlnaService.cs +++ b/MediaBrowser.Api/Dlna/DlnaService.cs @@ -34,8 +34,6 @@ namespace MediaBrowser.Api.Dlna [Route("/Dlna/Profiles/{Id}", "POST", Summary = "Updates a profile")] 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")] @@ -89,4 +87,4 @@ namespace MediaBrowser.Api.Dlna _dlnaManager.CreateProfile(request); } } -} +}
\ No newline at end of file diff --git a/SharedVersion.cs b/SharedVersion.cs index 108a16bf4..17087a098 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5991")] +[assembly: AssemblyVersion("3.1.75")] |