On Mon, Feb 20, 2012 at 10:19 PM, Gregory P. Smith <greg@krypto.org> 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 <python-checkins@python.org> wrote:

...

http://hg.python.org/cpython/rev/a0f43f4481e0 changeset:   75102:a0f43f4481e0 branch:      2.7

nevermind I see the follow up fixing commits now. :)