]> git.puffer.fish Git - mirror/frr.git/commit
lib: merge-prep lib/command.c (partial revert)
authorDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Nov 2016 16:51:45 +0000 (17:51 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Nov 2016 16:52:24 +0000 (17:52 +0100)
commitd7a64489f05d4bfba5e686aae941ef36eaa30688
treee712f9a473628efa1478fd5601d95c7d85f80f2c
parent094add014e590550430ca5e102b44ea30cf38f0f
lib: merge-prep lib/command.c (partial revert)

This reverts commit 45ef43000030a5801efc6c158786595c31355335,
for lib/command.c (to make a merge conflict go away).

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
lib/command.c