]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
projects / thirdparty / Python / cpython.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b5651ed) | patch
Removing the merge conflict markers.
authorSenthil Kumaran <senthil@uthcode.com>
Thu, 12 Sep 2013 14:06:49 +0000 (07:06 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Thu, 12 Sep 2013 14:06:49 +0000 (07:06 -0700)
commitf5ce0122ce210210456bae496f792d018c17b2be
treeb4a13af2416a323b705579f97f9893dbd43fb5b9tree | snapshot
parentb5651edaf12d0e3320c2a73ed9a6c4aaec7557d8commit | diff
Removing the merge conflict markers.

- my previous removal and hg resolve mark had still left them and hooks did not catch it too!
Lib/random.py diff | blob | blame | history
Mirror of https://github.com/python/cpython.git