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/pipacs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pipacs') diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile index b85913295..7478a5587 100644 --- a/package/pipacs/Makefile +++ b/package/pipacs/Makefile @@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pipacs PKG_VERSION:= 0.1 PKG_RELEASE:= 2 -PKG_DESCR:= an UNIX socket accounting/viewer program +PKG_DESCR:= unix socket accounting/viewer program PKG_SECTION:= net/misc NO_DISTFILES:= 1 -- cgit v1.2.3