fix merge conflicts

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);
         }
     }
-}
+}

SharedVersion.cs

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