]> git.ipfire.org Git - thirdparty/nftables.git/commit
netlink_delinarize: fix merge conflict
authorPatrick McHardy <kaber@trash.net>
Sat, 13 Jun 2015 12:50:25 +0000 (14:50 +0200)
committerPatrick McHardy <kaber@trash.net>
Sat, 13 Jun 2015 12:50:25 +0000 (14:50 +0200)
commit3ebcddc54c6e3016bc8eb61e4d1ca2f9ca5cd310
treec9fb7eca019a313d0825bd52eed17a364e32ec4b
parent077509fdea3aa009823491be7096749c84795874
netlink_delinarize: fix merge conflict

Signed-off-by: Patrick McHardy <kaber@trash.net>
src/netlink_delinearize.c