mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

delete error line

Browse source
This commit is contained in:
unknown 2018-04-18 20:19:50 +02:00
commit 8601db307d
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ryujinx.Core/OsHle/Services/Aud/IAudioDeviceService.cs
View file

@ -68,8 +68,6 @@ namespace Ryujinx.Core.OsHle.Services.Aud
Logging.Stub(LogClass.ServiceAudio, $"Volume = {Volume}, Position = {Position}, Size = {Size}"); Logging.Stub(LogClass.ServiceAudio, $"Volume = {Volume}, Position = {Position}, Size = {Size}");
<<<<<<< HEAD:Ryujinx.Core/OsHle/Services/Aud/IAudioDeviceService.cs
=======
return 0; return 0;
} }
@ -90,7 +88,6 @@ namespace Ryujinx.Core.OsHle.Services.Aud
Logging.Stub(LogClass.ServiceAudio, "Stubbed"); Logging.Stub(LogClass.ServiceAudio, "Stubbed");
>>>>>>> upstream/master:Ryujinx.Core/OsHle/Services/Aud/IAudioDeviceService.cs
return 0; return 0;
} }
} }