From c9a13955a1854f4cdee7bd782ad44e559498621a Mon Sep 17 00:00:00 2001
From: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:50:44 +0300
Subject: [PATCH] vk_scheduler: Silly merge conflict

---
 src/video_core/renderer_vulkan/vk_scheduler.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/video_core/renderer_vulkan/vk_scheduler.h b/src/video_core/renderer_vulkan/vk_scheduler.h
index c5fd1e2b3..1e640b083 100644
--- a/src/video_core/renderer_vulkan/vk_scheduler.h
+++ b/src/video_core/renderer_vulkan/vk_scheduler.h
@@ -94,16 +94,12 @@ public:
         return &master_semaphore;
     }
 
-<<<<<<< HEAD
     /// Defers an operation until the gpu has reached the current cpu tick.
     void DeferOperation(auto&& func) {
         pending_ops.emplace(func, CurrentTick());
     }
 
-    std::mutex submit_mutex;
-=======
     static std::mutex submit_mutex;
->>>>>>> 06b0f04 (liverpool: Better sync for CPU flips)
 
 private:
     void AllocateWorkerCommandBuffers();