__pkginfo__.py
changeset 5708 277c8a8eab21
parent 5707 3586d36d2a45
child 5719 8450389f2073
equal deleted inserted replaced
5707:3586d36d2a45 5708:277c8a8eab21
    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.2',
    46     'rql': '>= 0.26.0',
       
    47     'yams': '>= 0.30.0',
    46     'yams': '>= 0.30.0',
    48 =======
       
    49     'rql': '>= 0.26.2',
       
    50     'yams': '>= 0.28.1',
       
    51 >>>>>>> /tmp/__pkginfo__.py~other.ZMqgs5
       
    52     'docutils': '>= 0.6',
    47     'docutils': '>= 0.6',
    53     #gettext                    # for xgettext, msgcat, etc...
    48     #gettext                    # for xgettext, msgcat, etc...
    54     # web dependancies
    49     # web dependancies
    55     'simplejson': '>= 2.0.9',
    50     'simplejson': '>= 2.0.9',
    56     'lxml': '',
    51     'lxml': '',