fix merge conflict

2016-01-02 18:27:01 -05:00 · 2016-01-02 18:27:01 -05:00 · a8c482ba7e
commit a8c482ba7e
parent 895f4a1be4
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;