From 34e874228e8a86db1c789ccaaf50e38fcfb6d5a6 Mon Sep 17 00:00:00 2001
From: Neslisah Torosdagli <neslisah.torosdagli@amd.com>
Date: Thu, 19 Mar 2020 16:34:40 -0400
Subject: [PATCH] comment update, rayQueryEXT is writable, readonly check
 removed.

---
 glslang/MachineIndependent/Initialize.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp
index 3255810f..4b4ab80f 100644
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -4323,11 +4323,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
             "\n");
         }
 
-<<<<<<< HEAD
     // Builtins for GL_NV_ray_tracing/GL_EXT_ray_tracing/GL_EXT_ray_query
-=======
-    // Builtins for GL_NV_ray_tracing/GL_EXT_ray_tracing//GL_EXT_ray_query
->>>>>>> 74d6d6a2... GL_EXT_ray_query updates
     if (profile != EEsProfile && version >= 460) {
          commonBuiltins.append("void rayQueryInitializeEXT(rayQueryEXT, accelerationStructureEXT, uint, uint, vec3, float, vec3, float);"
             "bool rayQueryProceedEXT(rayQueryEXT);"