Merge pull request #10694 from opensourcerouting/pim6-nht-reenable

author Donald Sharp <donaldsharp72@gmail.com>

Wed, 9 Mar 2022 16:51:18 +0000 (11:51 -0500)

committer GitHub <noreply@github.com>

Wed, 9 Mar 2022 16:51:18 +0000 (11:51 -0500)
author Donald Sharp <donaldsharp72@gmail.com>
Wed, 9 Mar 2022 16:51:18 +0000 (11:51 -0500)
committer GitHub <noreply@github.com>
Wed, 9 Mar 2022 16:51:18 +0000 (11:51 -0500)
diff --cc pimd/pim6_stubs.c
Simple merge
diff --cc pimd/subdir.am
Simple merge
author	Donald Sharp <donaldsharp72@gmail.com>
	Wed, 9 Mar 2022 16:51:18 +0000 (11:51 -0500)
committer	GitHub <noreply@github.com>
	Wed, 9 Mar 2022 16:51:18 +0000 (11:51 -0500)
		1	2
pimd/pim6_stubs.c	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/subdir.am	patch \|	diff1 \|	diff2 \|	blob \| history