[Python-checkins] cpython: Removing the merge conflict markers.

[senthil.kumaran]

http://hg.python.org/cpython/rev/1398dfb59fd9
changeset:   85666:1398dfb59fd9
parent:      85663:51c252f69a68
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Thu Sep 12 07:06:49 2013 -0700
summary:
  Removing the merge conflict markers.

- my previous removal and hg resolve mark had still left them and hooks did not catch it too!

files:
  Lib/random.py |  5 -----
  1 files changed, 0 insertions(+), 5 deletions(-)


diff --git a/Lib/random.py b/Lib/random.py
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -257,16 +257,11 @@
     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

-- 
Repository URL: http://hg.python.org/cpython