From f5ce0122ce210210456bae496f792d018c17b2be Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <senthil@uthcode.com>
Date: Thu, 12 Sep 2013 07:06:49 -0700
Subject: 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 | 5 -----
 1 file changed, 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
-- 
cgit v0.12