]> git.puffer.fish Git - matthieu/frr.git/commit
pimd: Remove bad merges
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 18 Jan 2017 12:47:58 +0000 (07:47 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 18 Jan 2017 12:47:58 +0000 (07:47 -0500)
commitde6d2fa72ec622e26afdda32a7809f331483e8ca
tree4a726d99a0643f742d33823f3b8170425d9e7c2e
parentc2403b25989831d8a12fedc3e1af38c58520510d
pimd: Remove bad merges

Two functions were accidentally left around
as part of the merge operation.  Remove them.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
pimd/pim_cmd.c