Re: [sage-combinat-devel] conflicts in sage-combinat tree due to a recent change

On Wed, Jan 06, 2010 at 05:56:07PM +0100, Sébastien Labbé wrote: > Dear Nicolas, > > A recent changes created a conflict in the sage-combinat tree. It is > either me or you...but I think it is you! Oops! Fixed! > > Sincèrement, > > Sébastien > > sla...@pol:~/sage-4.3/devel/sage-combinat/sage/

[sage-combinat-devel] conflicts in sage-combinat tree due to a recent change

Dear Nicolas, A recent changes created a conflict in the sage-combinat tree. It is either me or you...but I think it is you! Sincèrement, Sébastien sla...@pol:~/sage-4.3/devel/sage-combinat/sage/combinat/words$ hg qpop -a la pile de patchs est maintenant vide sla...@pol:~/sage-4.3/devel/sage-co