From dcd37e81542418546255cdd451d0e5326d7dba35 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 25 Jan 2012 16:43:26 -0500 Subject: [PATCH] forgot to resolve this conflict... --- Doc/library/stdtypes.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index be4ce71351..e560360450 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 | -- 2.50.0