From a8c482ba7e6bbc2b579cd4125b5110f1df741dac Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 2 Jan 2016 18:27:01 -0500
Subject: [PATCH] fix merge conflict

---
 MediaBrowser.Api/System/SystemService.cs | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs
index 9b6b6a7d69..3f2b3d66a3 100644
--- 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;