]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
Fix committed merge conflict.
authorGeorg Brandl <georg@python.org>
Fri, 4 Jul 2008 15:45:10 +0000 (15:45 +0000)
committerGeorg Brandl <georg@python.org>
Fri, 4 Jul 2008 15:45:10 +0000 (15:45 +0000)
commit6e7196fb933f24abc915e9c20b9fa676a04b82c5
tree331694aa3b2511580e1a70abcd5fd504d99f877a
parente7c78b26c63728c0ebe081e2b9a1d9c543d2cc1d
Fix committed merge conflict.
Misc/NEWS