fix merge conflict

pull/702/head
Luke Pulverenti 9 years ago
parent 895f4a1be4
commit a8c482ba7e

@ -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;

Loading…
Cancel
Save