[GPU] Remove one merge conflict resolution line

2019-08-03 17:15:37 +03:00
parent e04dfe8833
commit cc7f26ada8
1 changed files with 0 additions and 1 deletions
--- 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"