forgot to resolve this conflict...

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index be4ce71351c0f024737f014880e8d3c98629c75b..e56036045083b7c55949bff35f1b801d468bc253 100644 (file)
--- 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    |