From: Maria Matejka <mq@ucw.cz>
Date: Fri, 13 Oct 2023 11:49:09 +0000 (+0200)
Subject: Merge commit '32427c9c' into thread-next
X-Git-Tag: v3.0.0~386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb4cf949d5311c4bdd38aa1c218c3b4642507335;p=thirdparty%2Fbird.git

Merge commit '32427c9c' into thread-next
---

fb4cf949d5311c4bdd38aa1c218c3b4642507335
diff --cc nest/config.Y
index f19ea5960,ce45d98d5..e186c8516
--- a/nest/config.Y
+++ b/nest/config.Y
@@@ -154,6 -154,8 +154,8 @@@ CF_ENUM_PX(T_ENUM_AF, AF_, AFI_, IPV4, 
  
  CF_GRAMMAR
  
 -kw_sym: MIN | MAX ;
++toksym: MIN | MAX ;
+ 
  /* Setting of router ID */
  
  conf: rtrid ;