mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-08 23:00:51 +02:00
Fixed a couple of merge errors.
This commit is contained in:
parent
33f6b13d4f
commit
086e2fdaa1
|
@ -1,11 +1,4 @@
|
||||||
#nullable enable
|
#nullable enable
|
||||||
#pragma warning disable CS1591
|
|
||||||
#pragma warning disable CA1819
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using MediaBrowser.Model.Dto;
|
|
||||||
using MediaBrowser.Model.Updates;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Model.Configuration
|
namespace MediaBrowser.Model.Configuration
|
||||||
{
|
{
|
||||||
|
|
|
@ -233,7 +233,7 @@ namespace MediaBrowser.Model.Configuration
|
||||||
/// Gets or sets a value indicating whether quick connect is available for use on this server.
|
/// Gets or sets a value indicating whether quick connect is available for use on this server.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool QuickConnectAvailable { get; set; } = false;
|
public bool QuickConnectAvailable { get; set; } = false;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets a value indicating whether access outside of the LAN is permitted.
|
/// Gets or sets a value indicating whether access outside of the LAN is permitted.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -440,4 +440,4 @@ namespace MediaBrowser.Model.Configuration
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int? ActivityLogRetentionDays { get; set; } = 30;
|
public int? ActivityLogRetentionDays { get; set; } = 30;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue