fix merge

4 years ago · f680a0fbbe
parent e6d8c02944
commit f680a0fbbe
1 changed files with 1 additions and 0 deletions
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@ -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; }