diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-01-25 21:43:26 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-01-25 21:43:26 (GMT) |
| commit | dcd37e81542418546255cdd451d0e5326d7dba35 (patch) | |
| tree | 832ac223577dd986653f737e0d6320be249985bd /Doc/library | |
| parent | af90a4044571242c81e2f42a1f3c5b277afa9d47 (diff) | |
| download | cpython-dcd37e81542418546255cdd451d0e5326d7dba35.zip cpython-dcd37e81542418546255cdd451d0e5326d7dba35.tar.gz cpython-dcd37e81542418546255cdd451d0e5326d7dba35.tar.bz2 | |
forgot to resolve this conflict...
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/stdtypes.rst | 4 |
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 | |