From bdf54290de2b489c965f1ee63b9e015f190dcfdd Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sat, 19 Oct 2024 16:31:56 +0300
Subject: [PATCH] fix merge conflict bug

---
 src/core/PICA/shader_gen_glsl.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/PICA/shader_gen_glsl.cpp b/src/core/PICA/shader_gen_glsl.cpp
index 0256c62d..44a75134 100644
--- a/src/core/PICA/shader_gen_glsl.cpp
+++ b/src/core/PICA/shader_gen_glsl.cpp
@@ -811,6 +811,7 @@ void main() {
 })";
 		return ret;
 	}
+}
 
 void FragmentGenerator::compileLogicOps(std::string& shader, const PICA::FragmentConfig& config) {
 	if (api != API::GLES) [[unlikely]] {