diff options
| -rw-r--r-- | Doc/using/cmdline.rst | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 1021e53..8704b7f 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -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. |