Fix error in merge conflict resolution

Signed-off-by: Arvind Sudarsanam <[email protected]>
Kode · Mar 8, 2023 · 738a7cc · 738a7cc
1 parent 391c490
commit 738a7cc
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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"
         },
         {