summaryrefslogtreecommitdiffstats
path: root/Misc/NEWS
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2013-08-23 16:10:09 (GMT)
committerBrett Cannon <brett@python.org>2013-08-23 16:10:09 (GMT)
commit330cc52c99037eaabe0fcfa09f9b099743b0b913 (patch)
tree8a4ef3fef2469e4fa2e5f9fbdd0567571fa1f8da /Misc/NEWS
parente2f6b799b81162cdefb0f3293212f8fa47f49713 (diff)
downloadcpython-330cc52c99037eaabe0fcfa09f9b099743b0b913.zip
cpython-330cc52c99037eaabe0fcfa09f9b099743b0b913.tar.gz
cpython-330cc52c99037eaabe0fcfa09f9b099743b0b913.tar.bz2
Delete merge markers
Diffstat (limited to 'Misc/NEWS')
0 files changed, 0 insertions, 0 deletions