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/totd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/totd') diff --git a/package/totd/Makefile b/package/totd/Makefile index 9e2e81335..93aa466f5 100644 --- a/package/totd/Makefile +++ b/package/totd/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= totd PKG_VERSION:= 1.5.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 7edaedae9f6aca5912dd6c123582cf08 -PKG_DESCR:= Trick or Treat Daemon (a simple DNS-ALG for NAT-PT) -PKG_SECTION:= dns +PKG_DESCR:= trick or treat daemon +PKG_SECTION:= net/dns PKG_URL:= http://www.dillema.net/software/totd.html PKG_SITES:= http://www.dillema.net/software/totd/ -- cgit v1.2.3