From 738a7cc081b29117349444412528a32011d5363a Mon Sep 17 00:00:00 2001
From: Arvind Sudarsanam <arvind.sudarsanam@intel.com>
Date: Wed, 8 Mar 2023 08:10:23 -0800
Subject: [PATCH] Fix error in merge conflict resolution

Signed-off-by: Arvind Sudarsanam <arvind.sudarsanam@intel.com>
---
 include/spirv/unified1/spirv.core.grammar.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index ee98c77a5..1ad517c9f 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -14933,7 +14933,6 @@
           "enumerant" : "FPGALatencyControlINTEL",
           "value" : 6171,
           "extensions" : [ "SPV_INTEL_fpga_latency_control" ],
-          "extensions" : [ "SPV_INTEL_kernel_attributes" ],
           "version" : "None"
         },
         {