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

Remove ">>>>" markers left over from merge

This commit is contained in:
Benjamin Peterson 2008-05-07 02:16:54 +00:00
parent 7d06089150
commit 9ea0117500
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Doc/using/cmdline.rst
View File

@ -212,17 +212,6 @@ Miscellaneous options
Discard docstrings in addition to the :option:`-O` optimizations.
<<<<<<< .working
=======
.. seealso::
:file:`Tools/scripts/fixdiv.py`
for a use of ``warnall``
:pep:`238` -- Changing the division operator
.. cmdoption:: -s
Don't add user site directory to sys.path
@ -236,7 +225,6 @@ Miscellaneous options
.. cmdoption:: -S
>>>>>>> .merge-right.r62788
Disable the import of the module :mod:`site` and the site-dependent
manipulations of :data:`sys.path` that it entails.