summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArvind Sudarsanam <arvind.sudarsanam@intel.com>2023-03-08 08:10:23 -0800
committerArvind Sudarsanam <arvind.sudarsanam@intel.com>2023-03-08 08:10:23 -0800
commit738a7cc081b29117349444412528a32011d5363a (patch)
tree845fe59e148de86ff10a4134d49185757c86d4ff /include
parent391c490359e75875bb641a577a36cd37b9114631 (diff)
downloadSPIRV-Headers-738a7cc081b29117349444412528a32011d5363a.tar.gz
SPIRV-Headers-738a7cc081b29117349444412528a32011d5363a.tar.bz2
SPIRV-Headers-738a7cc081b29117349444412528a32011d5363a.zip
Fix error in merge conflict resolution
Signed-off-by: Arvind Sudarsanam <arvind.sudarsanam@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/spirv/unified1/spirv.core.grammar.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index ee98c77..1ad517c 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"
},
{