only 1 conflict

This commit is contained in:
Mylloon 2023-10-24 22:56:19 +02:00
parent 74ab37ec6b
commit f596c5c64d
Signed by: Anri
GPG key ID: A82D63DFF8D1317F

View file

@ -348,10 +348,6 @@ mid_expression:
|e=simple_expression{ |e=simple_expression{
e e
} }
/* Parenthésage */
| LPAREN e=expression RPAREN {
e
}
/* Field record */ /* Field record */
| e=located(mid_expression) DOT l=located(label_identifier) tl=option(type_list) { | e=located(mid_expression) DOT l=located(label_identifier) tl=option(type_list) {