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/libcli/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/libcli') diff --git a/package/libcli/Makefile b/package/libcli/Makefile index cec7642a1..e15018270 100755 --- a/package/libcli/Makefile +++ b/package/libcli/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libcli PKG_VERSION:= 1.9.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 1b07b09e2840f910defde66afa28fbe7 -PKG_DESCR:= Cisco-like command-line interface library -PKG_SECTION:= libs +PKG_DESCR:= cisco-like command-line interface library +PKG_SECTION:= libs/misc PKG_URL:= http://sites.dparrish.com/libcli PKG_SITES:= https://github.com/dparrish/libcli PKG_OPTS:= dev -- cgit v1.2.3