]> granicus.if.org Git - python/commit
remove merge markers
authorBenjamin Peterson <benjamin@python.org>
Sun, 3 May 2015 02:34:31 +0000 (22:34 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 3 May 2015 02:34:31 +0000 (22:34 -0400)
commitc9083bf1a14d9949c07804123712d2a18566fe62
tree25323e670803d2ad720618fd6e3c256eb7fb65c1
parent97bd4b0cd9dec026bfaa66f492f1ea3c45abb1b1
remove merge markers
Misc/NEWS