equal
deleted
inserted
replaced
20 software |
20 software |
21 """ |
21 """ |
22 |
22 |
23 modname = distname = "cubicweb" |
23 modname = distname = "cubicweb" |
24 |
24 |
25 <<<<<<< /home/syt/src/cubicweb/__pkginfo__.py |
|
26 numversion = (3, 14, 0) |
25 numversion = (3, 14, 0) |
27 ======= |
|
28 numversion = (3, 13, 6) |
|
29 >>>>>>> /tmp/__pkginfo__.py~other.Prvgd6 |
|
30 version = '.'.join(str(num) for num in numversion) |
26 version = '.'.join(str(num) for num in numversion) |
31 |
27 |
32 description = "a repository of entities / relations for knowledge management" |
28 description = "a repository of entities / relations for knowledge management" |
33 author = "Logilab" |
29 author = "Logilab" |
34 author_email = "contact@logilab.fr" |
30 author_email = "contact@logilab.fr" |