From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/libnetfilter_cttimeout/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/libnetfilter_cttimeout') diff --git a/package/libnetfilter_cttimeout/Makefile b/package/libnetfilter_cttimeout/Makefile index 5fa0c4e1c..9f4de8a60 100644 --- a/package/libnetfilter_cttimeout/Makefile +++ b/package/libnetfilter_cttimeout/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.0 PKG_RELEASE:= 2 PKG_MD5SUM:= 7697437fc9ebb6f6b83df56a633db7f9 PKG_DESCR:= API to the fine-grain connection tracking timeout infrastructure -PKG_SECTION:= libs +PKG_SECTION:= libs/net PKG_DEPENDS:= libnfnetlink libmnl PKG_BUILDDEP:= libnfnetlink libmnl PKG_URL:= http://www.netfilter.org/projects/libnetfilter_cttimeout/ -- cgit v1.2.3