From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/linux-atm/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/linux-atm')

diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index eaa2db1eb..34d6c6972 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		linux-atm
 PKG_VERSION:=		2.5.1
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		9560b0e1f410a05b849dfdab465dd758
-PKG_DESCR:=		ATM library for Linux
-PKG_SECTION:=		libs
+PKG_DESCR:=		atm library
+PKG_SECTION:=		libs/net
 PKG_BUILDDEP:=		flex-host
 PKG_URL:=		http://linux-atm.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=linux-atm/}
@@ -21,7 +21,7 @@ PKG_HOST_DEPENDS:=	!freebsd
 PKG_SUBPKGS:=		LIBATM BR2684CTL
 PKGSD_BR2684CTL:=	br2684ctl ATM utility
 PKGSS_BR2684CTL:=	libatm
-PKGSC_BR2684CTL:=	route
+PKGSC_BR2684CTL:=	net/route
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
-- 
cgit v1.2.3