cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
hplattner 2016-03-01 15:01:19 +01:00
commit a68eddd928
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
setup.py
View file

@ -20,7 +20,7 @@ setup(name='cybertools',
install_requires=[ install_requires=[
# -*- Extra requirements: -*- # -*- Extra requirements: -*-
'lxml', 'lxml',
'Pillow', #'PIL',
'zope.app.catalog', 'zope.app.catalog',
'zope.app.file', 'zope.app.file',
'zope.app.intid', 'zope.app.intid',