[issue16517] address merge conflicts in devguide null-merge instructions

[Chris Jerdonek]

Chris Jerdonek added the comment:

Addressed by: http://hg.python.org/devguide/rev/78a69b929ab7

(I accidentally left the issue number out of the commit message.)

----------
resolution:  -> fixed
stage: patch review -> committed/rejected
status: open -> closed

_______________________________________
Python tracker <report at bugs.python.org>
<http://bugs.python.org/issue16517>
_______________________________________