fix merge

This commit is contained in:
Gary Wilber 2020-11-08 11:55:38 -08:00
parent e6d8c02944
commit f680a0fbbe

View File

@ -271,6 +271,7 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
public string[] KnownProxies { get; set; }
/// <summary>
/// Gets or sets the number of days we should retain activity logs.
/// </summary>
public int? ActivityLogRetentionDays { get; set; }