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/httping/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/httping') diff --git a/package/httping/Makefile b/package/httping/Makefile index 771480782..5c2e5feab 100644 --- a/package/httping/Makefile +++ b/package/httping/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= httping PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= bde1ff3c01343d2371d8f34fbf8a1d9a -PKG_DESCR:= Httping is like 'ping' but for http-requests -PKG_SECTION:= net +PKG_DESCR:= like ping but for http-requests +PKG_SECTION:= net/http PKG_DEPENDS:= libopenssl PKG_BUILDDEP:= openssl PKG_SITES:= http://www.vanheusden.com/httping/ -- cgit v1.2.3