Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Removing the merge conflict markers. 

- my previous removal and hg resolve mark had still left them and hooks did not catch it too!
This commit is contained in:
Senthil Kumaran 2013-09-12 07:06:49 -07:00
parent b5651edaf1
commit f5ce0122ce
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/random.py
View File

@ -257,16 +257,11 @@ class Random(_random.Random):
def shuffle(self, x, random=None, int=int): def shuffle(self, x, random=None, int=int):
"""Shuffle list x in place, and return None. """Shuffle list x in place, and return None.
<<<<<<< local
Optional argument random is a 0-argument function returning a Optional argument random is a 0-argument function returning a
random float in [0.0, 1.0); if it is the default None, the random float in [0.0, 1.0); if it is the default None, the
standard random.random will be used. standard random.random will be used.
=======
Optional arg random is a 0-argument function returning a random
float in [0.0, 1.0); by default, the standard random.random.
Do not supply the 'int' argument. Do not supply the 'int' argument.
>>>>>>> other
""" """
randbelow = self._randbelow randbelow = self._randbelow