[Python-checkins] cpython (2.7): forgot to resolve this conflict...

[benjamin.peterson]

http://hg.python.org/cpython/rev/9133d956b3ce
changeset:   74625:9133d956b3ce
branch:      2.7
parent:      74619:ed6d9249da0c
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Jan 25 16:43:26 2012 -0500
summary:
  forgot to resolve this conflict...

files:
  Doc/library/stdtypes.rst |  4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -422,12 +422,8 @@
 operations and higher than the comparisons; the unary operation ``~`` has the
 same priority as the other unary numeric operations (``+`` and ``-``).
 
-<<<<<<< local
-This table lists the bit-string operations sorted in ascending priority:
-=======
 This table lists the bitwise operations sorted in ascending priority
 (operations in the same box have the same priority):
->>>>>>> other
 
 +------------+--------------------------------+----------+
 | Operation  | Result                         | Notes    |

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