resolve conflicts

Signed-off-by: Slice <sergey.slice@gmail.com>
CloverHackyColor · Jan 22, 2024 · 2bccbc7 · 2bccbc7
1 parent 76704c3
commit 2bccbc7
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/Library/OcMainLib/OpenCoreUefi.c b/Library/OcMainLib/OpenCoreUefi.c
@@ -391,7 +391,6 @@ OcReinstallProtocols (
   BOOLEAN      OverrideAppleEvent;
 
 
-#ifndef CLOVER_BUILD
   if (OcAudioInstallProtocols (
         Config->Uefi.ProtocolOverrides.AppleAudio,
         Config->Uefi.Audio.DisconnectHda
@@ -1053,17 +1052,11 @@ OcLoadUefiSupport (
   }
 
   OcLoadUefiOutputSupport (Storage, Config);
-<<<<<<< HEAD
-#ifndef CLOVER_BUILD
-  OcLoadUefiAudioSupport (Storage, Config);
-#endif
-=======
 
 #ifndef CLOVER_BUILD
   OcLoadUefiAudioSupport (Storage, Config);
 #endif
 
->>>>>>> 7e9c25b7f5786ebb7a6d833ab5b756329a48f60f
   gBS->CreateEvent (
          EVT_SIGNAL_EXIT_BOOT_SERVICES,
          TPL_CALLBACK,