fix merge conflict

9 years ago · 475529ec7f
parent c0c663a174
commit 475529ec7f
1 changed files with 0 additions and 11 deletions
--- a/MediaBrowser.Api/System/SystemService.cs
+++ b/MediaBrowser.Api/System/SystemService.cs
@ -32,12 +32,6 @@ namespace MediaBrowser.Api.System
    }
    [Route("/System/Ping", "POST")]
    public class PingSystem : IReturnVoid
    {
    }
    /// <summary>
    /// Class RestartApplication
    /// </summary>
@ -110,11 +104,6 @@ namespace MediaBrowser.Api.System
            _security = security;
        }
        public object Post(PingSystem request)
        {
            return _appHost.Name;
        }
        public object Get(GetServerLogs request)
        {
            List<FileSystemMetadata> files;