From 4fbb2cde4d804941f8a8354a75e506009bcb243f Mon Sep 17 00:00:00 2001
From: Ac_K <Acoustik666@gmail.com>
Date: Thu, 25 Jan 2024 19:18:43 +0100
Subject: [PATCH] Fix prepo

---
 src/Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs | 1 -
 src/Ryujinx.Horizon/Prepo/PrepoIpcServer.cs   | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/src/Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs b/src/Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs
index 823f9e52d580..4ed7dd48e228 100644
--- a/src/Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs
+++ b/src/Ryujinx.Horizon/Prepo/Ipc/PrepoService.cs
@@ -233,7 +233,6 @@ private Result ProcessPlayReport(PlayReportKind playReportKind, ReadOnlySpan<byt
 
             Logger.Info?.Print(LogClass.ServicePrepo, builder.ToString());
 
-
             return Result.Success;
         }
     }
diff --git a/src/Ryujinx.Horizon/Prepo/PrepoIpcServer.cs b/src/Ryujinx.Horizon/Prepo/PrepoIpcServer.cs
index c9d16ab48984..1902cde23a11 100644
--- a/src/Ryujinx.Horizon/Prepo/PrepoIpcServer.cs
+++ b/src/Ryujinx.Horizon/Prepo/PrepoIpcServer.cs
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 using Ryujinx.Horizon.Prepo.Types;
-=======
-using Ryujinx.Horizon.Prepo.Types;
 using Ryujinx.Horizon.Sdk.Arp;
->>>>>>> 7e259965 (ArpApi in PrepoIpcServer and remove LmApi)
 using Ryujinx.Horizon.Sdk.Sf.Hipc;
 using Ryujinx.Horizon.Sdk.Sm;