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_conntrack/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libnetfilter_conntrack') diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile index 90c74f5c1..a23579dd5 100644 --- a/package/libnetfilter_conntrack/Makefile +++ b/package/libnetfilter_conntrack/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libnetfilter_conntrack PKG_VERSION:= 1.0.4 PKG_RELEASE:= 2 PKG_MD5SUM:= 18cf80c4b339a3285e78822dbd4f08d7 -PKG_DESCR:= API to connection tracking state table -PKG_SECTION:= libs +PKG_DESCR:= connection tracking state table library +PKG_SECTION:= libs/net PKG_DEPENDS:= libnfnetlink libmnl PKG_BUILDDEP:= libnfnetlink libmnl PKG_URL:= http://www.netfilter.org/projects/libnetfilter_conntrack/ -- cgit v1.2.3