[Bf-blender-cvs] [9cc50756808] tmp-vulkan: Ghost: Fix unresolved merge conflict

[Ray Molenkamp]

Commit: 9cc507568089eba53f7ae9ac17d6d6bee7804a55
Author: Ray Molenkamp
Date:   Wed Jun 30 10:48:59 2021 -0600
Branches: tmp-vulkan
https://developer.blender.org/rB9cc507568089eba53f7ae9ac17d6d6bee7804a55

Ghost: Fix unresolved merge conflict

Introduced by rBddd64ba0

===================================================================

M	intern/ghost/intern/GHOST_SystemWin32.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 53044afeca5..b911fbed360 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -50,7 +50,6 @@
 #include "GHOST_WindowManager.h"
 #include "GHOST_WindowWin32.h"
 
-<<<<<<< HEAD
 #if defined(WITH_VULKAN)
 #  include "GHOST_ContextVK.h"
 #endif
@@ -60,9 +59,6 @@
 #else
 #  include "GHOST_ContextWGL.h"
 #endif
-=======
-#include "GHOST_ContextWGL.h"
->>>>>>> master
 
 #ifdef WITH_INPUT_NDOF
 #  include "GHOST_NDOFManagerWin32.h"