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/snort/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/snort') diff --git a/package/snort/Makefile b/package/snort/Makefile index cfd2a8fa9..6ad6f3365 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= snort PKG_VERSION:= 2.9.5 PKG_RELEASE:= 1 PKG_MD5SUM:= f5fc0e176afca5989d47509478758fc7 -PKG_DESCR:= flexible Network Intrusion Detection System (NIDS) +PKG_DESCR:= flexible network intrusion detection system PKG_SECTION:= net/security PKG_DEPENDS:= libnet libpcap libpcre libtirpc daq PKG_BUILDDEP:= libnet libpcap pcre libtirpc daq -- cgit v1.2.3