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/cherrypy/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/cherrypy/Makefile') diff --git a/package/cherrypy/Makefile b/package/cherrypy/Makefile index b103c02c9..f904be4af 100644 --- a/package/cherrypy/Makefile +++ b/package/cherrypy/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 3.3.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 4ac4af5ac21a893f07221cbd7ec4be11 PKG_DESCR:= python web framework -PKG_SECTION:= libs +PKG_SECTION:= net/http PKG_DEPENDS:= python2 PKG_BUILDDEP:= python2 PKG_URL:= http://www.cherrypy.org/ -- cgit v1.2.3