[yt-dev] yt-3.0 two heads

[Michael Zingale]

At the moment, in the yt repo, we have two heads on the yt-3.0 branch -- is
that what we want?  I try merging them in my local copy and it doesn't go
cleanly.

-- 
Michael Zingale
Associate Professor

Dept. of Physics & Astronomy • Stony Brook University • Stony Brook, NY
11794-3800
*phone*:  631-632-8225
*e-mail*: Michael.Zingale at stonybrook.edu
*web*: http://www.astro.sunysb.edu/mzingale
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.spacepope.org/pipermail/yt-dev-spacepope.org/attachments/20140930/958d6a80/attachment.htm>