traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

forgot to resolve this conflict...

This commit is contained in:
Benjamin Peterson 2012-01-25 16:43:26 -05:00
parent af90a40445
commit dcd37e8154
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/stdtypes.rst
View File

@ -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 |