diff options
author | Mark Dickinson <dickinsm@gmail.com> | 2009-03-21 10:51:42 +0000 |
---|---|---|
committer | Mark Dickinson <dickinsm@gmail.com> | 2009-03-21 10:51:42 +0000 |
commit | af23217798749787b32e8b961126ecc14b888e52 (patch) | |
tree | 7fc7237eb4e11f8665bedeb7d3ba957f177c5b35 /Objects/tupleobject.c | |
parent | ae681df4d8a0edf22a60e853d519c42012c31983 (diff) | |
download | cpython-git-af23217798749787b32e8b961126ecc14b888e52.tar.gz |
Remove remnants of svn conflict marker from Misc/NEWS
Diffstat (limited to 'Objects/tupleobject.c')
0 files changed, 0 insertions, 0 deletions