mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 03:48:06 +02:00
fix merge conflict
This commit is contained in:
parent
895f4a1be4
commit
a8c482ba7e
1 changed files with 0 additions and 11 deletions
|
@ -32,12 +32,6 @@ namespace MediaBrowser.Api.System
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[Route("/System/Ping", "POST")]
|
|
||||||
public class PingSystem : IReturnVoid
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Class RestartApplication
|
/// Class RestartApplication
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -110,11 +104,6 @@ namespace MediaBrowser.Api.System
|
||||||
_security = security;
|
_security = security;
|
||||||
}
|
}
|
||||||
|
|
||||||
public object Post(PingSystem request)
|
|
||||||
{
|
|
||||||
return _appHost.Name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public object Get(GetServerLogs request)
|
public object Get(GetServerLogs request)
|
||||||
{
|
{
|
||||||
List<FileSystemMetadata> files;
|
List<FileSystemMetadata> files;
|
||||||
|
|
Loading…
Reference in a new issue