Benjamin Root <ben.r...@ou.edu> writes: > I managed to merge my docfix/improve_description branch over to v1.0.x, but > I am having trouble merging correctly over to master. It appears that the > README.osx and make.osx files were changed in v1.0.x, but not in > master.
That was me: those changes don't apply cleanly to master, so I have another pull request with the corresponding changes. I made some changes it to recently, and it had not received any comments after that, so I was hesitant to merge it yet. I tried to merge my changes into master with the no-op "ours" strategy to prevent exactly this kind of problems while waiting for the other request to move forward, but apparently I didn't do it right. I'll take a look tonight (but right now I must attend to other things). -- Jouni K. Seppänen http://www.iki.fi/jks ------------------------------------------------------------------------------ Create and publish websites with WebMatrix Use the most popular FREE web apps or write code yourself; WebMatrix provides all the features you need to develop and publish your website. http://p.sf.net/sfu/ms-webmatrix-sf _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
