Fix prepo

AcK77 · Jan 25, 2024 · 4fbb2cd · 4fbb2cd
1 parent 79ea884
commit 4fbb2cd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git 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
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up @@
                 Logger.Info?.Print(LogClass.ServicePrepo, builder.ToString());
                 return Result.Success;
             }
         }
@@ Expand Down @@