Re: [sage-combinat-devel] combinat queue failed to apply to sage-5.10.rc2

2013-06-18 Thread Jeff
Anne, It is fixed. Thanks! Jeff On Tuesday, June 18, 2013 7:06:25 PM UTC-4, Anne Schilling wrote: > > Hi Jeff, > > The conflict should be fixed now. > > Nicolas, I folded the NSM review patch, so please pull from the queue > before working on it > further! > > Best, > > Anne > > On 6/18/13

Re: [sage-combinat-devel] combinat queue failed to apply to sage-5.10.rc2

2013-06-18 Thread Anne Schilling
Hi Jeff, The conflict should be fixed now. Nicolas, I folded the NSM review patch, so please pull from the queue before working on it further! Best, Anne On 6/18/13 3:30 PM, Jeff wrote: > I cannot get the combinat queue to apply. Any suggestions? > > applying finiteenumset_random_improve-fh.

[sage-combinat-devel] combinat queue failed to apply to sage-5.10.rc2

2013-06-18 Thread Jeff
I cannot get the combinat queue to apply. Any suggestions? applying finiteenumset_random_improve-fh.patch skipping trac_8386_iet_alphabet_bug-vd.patch - guarded by '+disabled' skipping trac_8388_pickling_path-vd.patch - guarded by '+disabled' applying missing-doc-includes-nt.patch applying dyck_wo