]> git.ipfire.org Git - thirdparty/nftables.git/commit
meta: fix mismerge
authorPatrick McHardy <kaber@trash.net>
Wed, 15 Jan 2014 11:53:23 +0000 (11:53 +0000)
committerPatrick McHardy <kaber@trash.net>
Wed, 15 Jan 2014 11:53:23 +0000 (11:53 +0000)
commit646dccd732b8d26484d5d07ff59d44a1770cf736
treedd4a8a3996a3698d4e50ede8ef31117cbe6f7ce5
parent24879f1173e5778cc76507ae17df0cadb78e21a0
meta: fix mismerge

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