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/rp-pppoe/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/rp-pppoe/Makefile') diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile index ef78bbc82..c449a19dc 100644 --- a/package/rp-pppoe/Makefile +++ b/package/rp-pppoe/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= rp-pppoe PKG_VERSION:= 3.10 PKG_RELEASE:= 1 PKG_MD5SUM:= d58a13cc4185bca6121a606ff456dec0 -PKG_DESCR:= PPPoE (PPP over Ethernet) tools -PKG_SECTION:= ppp +PKG_DESCR:= ppp over ethernet tools +PKG_SECTION:= net/ppp PKG_DEPENDS:= ppp PKG_URL:= http://www.roaringpenguin.com/ PKG_SITES:= http://www.roaringpenguin.com/files/download/ -- cgit v1.2.3