[yt-dev] yt-3.0 two heads

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@stonybrook.edu *web*: http://www.astro.sunysb.edu/mzingale