From 8601db307d4fd41c4a9d6c9dde908efc6cb0488a Mon Sep 17 00:00:00 2001
From: unknown <mgnjulien@gmail.com>
Date: Wed, 18 Apr 2018 20:19:50 +0200
Subject: [PATCH] delete error line

---
 Ryujinx.Core/OsHle/Services/Aud/IAudioDeviceService.cs | 3 ---
 1 file changed, 3 deletions(-)

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