On Mon, Feb 20, 2012 at 10:19 PM, Gregory P. Smith <[email protected]> wrote: > Look at PCbuild/pythoncore.vcproj within this commit, it looks like > you committed (or merged) a merge conflict marker in the file. > > -gps > > On Mon, Feb 20, 2012 at 6:49 PM, benjamin.peterson > <[email protected]> wrote: >> http://hg.python.org/cpython/rev/a0f43f4481e0 >> changeset: 75102:a0f43f4481e0 >> branch: 2.7
nevermind I see the follow up fixing commits now. :) _______________________________________________ Python-Dev mailing list [email protected] http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
