fix merge conflict

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;