Oops, sorry, fixed now. Florent: thanks for cleaning up after me.
Andrew On Tuesday, 23 April 2013 23:38:00 UTC+10, fhivert wrote: > > Dear Andrew, > > During your last rebase you introduced the following lines in your patch: > > tableaux-combinatorics-am.patch:+<<<<del from tableau_tuple import > TableauTuple, StandardTableauTuple, TableauTuples, StandardTableauTuples > trac_Kleshchev-partitions-am.patch:+<<<<del from partition_tuple import > PartitionTuple, PartitionTuples > > This is probably due to some wrongly resolved conflict. I disabled > temporarily > your patches with the guard "+wrong_rebase". Can you resolve the problem > or do > you need some help ? > > Cheers, > > Florent > -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-combinat-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-combinat-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en. For more options, visit https://groups.google.com/groups/opt_out.
