fix merge conflict

2016-03-01 15:01:19 +01:00 · 2016-03-01 15:01:19 +01:00 · a68eddd928
commit a68eddd928
parent 66526863ca 0507cc7a15
1 changed files with 1 additions and 1 deletions
--- a/setup.py
+++ b/setup.py
@ -20,7 +20,7 @@ setup(name='cybertools',
      install_requires=[
            # -*- Extra requirements: -*-
            'lxml',
-            'Pillow',
+            #'PIL',
            'zope.app.catalog',
            'zope.app.file',
            'zope.app.intid',