Merge pull request #8458 from opensourcerouting/xref-5424

author Donald Sharp <donaldsharp72@gmail.com>

Tue, 8 Feb 2022 20:56:20 +0000 (15:56 -0500)

committer GitHub <noreply@github.com>

Tue, 8 Feb 2022 20:56:20 +0000 (15:56 -0500)
author Donald Sharp <donaldsharp72@gmail.com>
Tue, 8 Feb 2022 20:56:20 +0000 (15:56 -0500)
committer GitHub <noreply@github.com>
Tue, 8 Feb 2022 20:56:20 +0000 (15:56 -0500)
diff --cc configure.ac
Simple merge
diff --cc doc/user/basic.rst
Simple merge
diff --cc lib/command.h
Simple merge
diff --cc lib/libfrr.c
Simple merge
diff --cc lib/subdir.am
Simple merge
author	Donald Sharp <donaldsharp72@gmail.com>
	Tue, 8 Feb 2022 20:56:20 +0000 (15:56 -0500)
committer	GitHub <noreply@github.com>
	Tue, 8 Feb 2022 20:56:20 +0000 (15:56 -0500)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
doc/user/basic.rst	patch \|	diff1 \|	diff2 \|	blob \| history
lib/command.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/libfrr.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/subdir.am	patch \|	diff1 \|	diff2 \|	blob \| history