Merge pull request #274 from vincentbernat/feature/keep-some-ports

author Vincent Bernat <vincent@bernat.im>

Sun, 18 Mar 2018 11:08:13 +0000 (12:08 +0100)

committer GitHub <noreply@github.com>

Sun, 18 Mar 2018 11:08:13 +0000 (12:08 +0100)
author Vincent Bernat <vincent@bernat.im>
Sun, 18 Mar 2018 11:08:13 +0000 (12:08 +0100)
committer GitHub <noreply@github.com>
Sun, 18 Mar 2018 11:08:13 +0000 (12:08 +0100)
diff --cc src/lldpd-structs.c
Simple merge
diff --cc src/lldpd-structs.h
Simple merge
author	Vincent Bernat <vincent@bernat.im>
	Sun, 18 Mar 2018 11:08:13 +0000 (12:08 +0100)
committer	GitHub <noreply@github.com>
	Sun, 18 Mar 2018 11:08:13 +0000 (12:08 +0100)
		1	2
src/lldpd-structs.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lldpd-structs.h	patch \|	diff1 \|	diff2 \|	blob \| history