diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2013-09-12 14:06:49 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2013-09-12 14:06:49 (GMT) |
| commit | f5ce0122ce210210456bae496f792d018c17b2be (patch) | |
| tree | b4a13af2416a323b705579f97f9893dbd43fb5b9 /Lib/random.py | |
| parent | b5651edaf12d0e3320c2a73ed9a6c4aaec7557d8 (diff) | |
| download | cpython-f5ce0122ce210210456bae496f792d018c17b2be.zip cpython-f5ce0122ce210210456bae496f792d018c17b2be.tar.gz cpython-f5ce0122ce210210456bae496f792d018c17b2be.tar.bz2 | |
Removing the merge conflict markers.
- my previous removal and hg resolve mark had still left them and hooks did not catch it too!
Diffstat (limited to 'Lib/random.py')
| -rw-r--r-- | Lib/random.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Lib/random.py b/Lib/random.py index e63e94f..4ebc757 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -257,16 +257,11 @@ class Random(_random.Random): def shuffle(self, x, random=None, int=int): """Shuffle list x in place, and return None. -<<<<<<< local Optional argument random is a 0-argument function returning a random float in [0.0, 1.0); if it is the default None, the 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. ->>>>>>> other """ randbelow = self._randbelow |