From cc7f26ada8d4fa2731f2d5a44de00b220904f3ed Mon Sep 17 00:00:00 2001
From: Triang3l <triang3l@yandex.ru>
Date: Sat, 3 Aug 2019 17:15:37 +0300
Subject: [PATCH] [GPU] Remove one merge conflict resolution line

---
 src/xenia/gpu/shader_compiler_main.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/xenia/gpu/shader_compiler_main.cc b/src/xenia/gpu/shader_compiler_main.cc
index 130d2c96d..05000dc67 100644
--- a/src/xenia/gpu/shader_compiler_main.cc
+++ b/src/xenia/gpu/shader_compiler_main.cc
@@ -23,7 +23,6 @@
 #include "xenia/gpu/spirv_shader_translator.h"
 #include "xenia/ui/spirv/spirv_disassembler.h"
 
-<<<<<<< HEAD
 // For D3DDisassemble:
 #if XE_PLATFORM_WIN32
 #include "xenia/ui/d3d12/d3d12_api.h"