fix(csql_grammar): wrong merge resolution

CUBRID · Dec 17, 2024 · 06ca368 · 06ca368
1 parent 5f91731
commit 06ca368
Showing 1 changed file with 0 additions and 30 deletions.
diff --git a/src/parser/csql_grammar.y b/src/parser/csql_grammar.y
@@ -22136,7 +22136,6 @@ primitive_type
 		DBG_PRINT}}
 	;
 
-<<<<<<< HEAD
 opt_vector_args
   : /* empty */
 		{{ DBG_TRACE_GRAMMAR(opt_vector_args, : );
@@ -22164,35 +22163,6 @@ opt_vector_args
 		DBG_PRINT}}
 	;
 
-opt_vector_args
-  : /* empty */
-		{{ DBG_TRACE_GRAMMAR(opt_vector_args, : );
-
-			container_2 ctn;
-			SET_CONTAINER_2 (ctn, NULL, NULL);
-			$$ = ctn;
-
-		DBG_PRINT}}
-	| '(' unsigned_integer ')'
-		{{ DBG_TRACE_GRAMMAR(opt_vector_args, | '(' unsigned_integer ')' );
-
-			container_2 ctn;
-			SET_CONTAINER_2 (ctn, $2, NULL);
-			$$ = ctn;
-
-		DBG_PRINT}}
-	| '(' unsigned_integer ',' primitive_type ')'
-		{{ DBG_TRACE_GRAMMAR(opt_vector_args, | '(' unsigned_integer ',' primitive_type ')' );
-
-			container_2 ctn;
-      // TODO: primitive_type not yet handled.
-      container_2 primitive_type_container = $4;
-
-			SET_CONTAINER_2 (ctn, $2, NULL);
-			$$ = ctn;
-
-		DBG_PRINT}}
-	;
 
 opt_internal_external
 	: /* empty */