Merge pull request #15397 from idryzhov/zebra-oper

author Russ White <russ@riw.us>

Tue, 5 Mar 2024 16:41:35 +0000 (11:41 -0500)

committer GitHub <noreply@github.com>

Tue, 5 Mar 2024 16:41:35 +0000 (11:41 -0500)
author Russ White <russ@riw.us>
Tue, 5 Mar 2024 16:41:35 +0000 (11:41 -0500)
committer GitHub <noreply@github.com>
Tue, 5 Mar 2024 16:41:35 +0000 (11:41 -0500)
diff --cc zebra/zebra_nb.c
Simple merge
diff --cc zebra/zebra_nb.h
Simple merge
author	Russ White <russ@riw.us>
	Tue, 5 Mar 2024 16:41:35 +0000 (11:41 -0500)
committer	GitHub <noreply@github.com>
	Tue, 5 Mar 2024 16:41:35 +0000 (11:41 -0500)
		1	2
zebra/zebra_nb.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_nb.h	patch \|	diff1 \|	diff2 \|	blob \| history