Mercurial > evolve
diff setup.py @ 533:87c41ef95ebf stable
test conflicting conflicting (sic) resolution
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 30 Aug 2012 13:50:17 +0200 |
parents | 46f1597bcfe6 |
children | 3859f8e7d0d1 |