__pkginfo__.py
changeset 5707 3586d36d2a45
parent 5664 2561b0e1c894
parent 5702 9fb240cf0f61
child 5708 277c8a8eab21
equal deleted inserted replaced
5705:30b94973bc67 5707:3586d36d2a45
    40 ]
    40 ]
    41 
    41 
    42 __depends__ = {
    42 __depends__ = {
    43     'logilab-common': '>= 0.50.2',
    43     'logilab-common': '>= 0.50.2',
    44     'logilab-mtconverter': '>= 0.6.0',
    44     'logilab-mtconverter': '>= 0.6.0',
       
    45 <<<<<<< /home/syt/src/fcubicweb/cubicweb/__pkginfo__.py
    45     'rql': '>= 0.26.0',
    46     'rql': '>= 0.26.0',
    46     'yams': '>= 0.30.0',
    47     'yams': '>= 0.30.0',
       
    48 =======
       
    49     'rql': '>= 0.26.2',
       
    50     'yams': '>= 0.28.1',
       
    51 >>>>>>> /tmp/__pkginfo__.py~other.ZMqgs5
    47     'docutils': '>= 0.6',
    52     'docutils': '>= 0.6',
    48     #gettext                    # for xgettext, msgcat, etc...
    53     #gettext                    # for xgettext, msgcat, etc...
    49     # web dependancies
    54     # web dependancies
    50     'simplejson': '>= 2.0.9',
    55     'simplejson': '>= 2.0.9',
    51     'lxml': '',
    56     'lxml': '',