From 666d53299c9cc61d88c0a4ed32cebd7cbbb5b712 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sun, 25 Mar 2018 17:57:53 -0400
Subject: graphics_surface: Fix merge conflicts.

---
 src/video_core/gpu.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/video_core')

diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h
index ab24504a6..71a8661b4 100644
--- a/src/video_core/gpu.h
+++ b/src/video_core/gpu.h
@@ -14,6 +14,7 @@
 namespace Tegra {
 
 enum class RenderTargetFormat : u32 {
+    NONE = 0x0,
     RGBA8_UNORM = 0xD5,
 };
 
-- 
cgit v1.2.3