diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/cherrypy/Makefile | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/cherrypy/Makefile')
-rw-r--r-- | package/cherrypy/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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/ |