I'm not sure that everyone was getting the same conflict as I
was and I am not sure why.  I just disabled your patch and I will
fold it into mine later.

I think that I also fixed the NCSF conflict that was also happening
between my patch and Chris'.

-Mike

On Friday, 1 June 2012 09:07:04 UTC-4, Martin wrote:
>
> Mike Zabrocki writes: 
>
> > Hi all, 
> > 
> > I've been working on a major revamp of symmetric functions. It is 
> > possible that the changes I have been making conflict with Martin's 
> > recent changes to the `principle specialization` and have broken the 
> > queue. 
>
> Sorry for that.  Should I revert?  Alternatively: why don't you just 
> copy the specializations into your patch and we delete mine (no idea how 
> to do that, I admit) 
>
> Martin 
>

-- 
You received this message because you are subscribed to the Google Groups 
"sage-combinat-devel" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/sage-combinat-devel/-/msBrSuDdrVgJ.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
To unsubscribe from this group, send email to 
sage-combinat-devel+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/sage-combinat-devel?hl=en.

Reply via email to