ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[GPU] Remove one merge conflict resolution line

This commit is contained in:
Triang3l 2019-08-03 17:15:37 +03:00
parent e04dfe8833
commit cc7f26ada8
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/xenia/gpu/shader_compiler_main.cc
View File

@ -23,7 +23,6 @@
#include "xenia/gpu/spirv_shader_translator.h" #include "xenia/gpu/spirv_shader_translator.h"
#include "xenia/ui/spirv/spirv_disassembler.h" #include "xenia/ui/spirv/spirv_disassembler.h"
<<<<<<< HEAD
// For D3DDisassemble: // For D3DDisassemble:
#if XE_PLATFORM_WIN32 #if XE_PLATFORM_WIN32
#include "xenia/ui/d3d12/d3d12_api.h" #include "xenia/ui/d3d12/d3d12_api.h"