summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/library/stdtypes.rst4
1 files changed, 0 insertions, 4 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index be4ce71..e560360 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -422,12 +422,8 @@ The priorities of the binary bitwise operations are all lower than the numeric
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 |