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/htpdate/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/htpdate') diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile index f7800da67..30ec95716 100644 --- a/package/htpdate/Makefile +++ b/package/htpdate/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= htpdate PKG_VERSION:= 1.0.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 40f193e3d7220265f6e6f8d4d7f887da -PKG_DESCR:= HTP (Hypertext Time Protocol) implementation -PKG_SECTION:= ntp +PKG_DESCR:= hypertext time protocol implementation +PKG_SECTION:= net/ntp PKG_URL:= http://www.vervest.org/htp/ PKG_SITES:= http://www.vervest.org/htp/archive/c/ -- cgit v1.2.3