diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-05-07 02:16:54 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-05-07 02:16:54 (GMT) |
| commit | 9ea011750037d755deb5ba30b2cef5fb58433e3f (patch) | |
| tree | 06fe7afb947e5d6440791143dca764ffb16c633b /Doc | |
| parent | 7d060891502d4502a6f0d39e0313bdfdbea955bd (diff) | |
| download | cpython-9ea011750037d755deb5ba30b2cef5fb58433e3f.zip cpython-9ea011750037d755deb5ba30b2cef5fb58433e3f.tar.gz cpython-9ea011750037d755deb5ba30b2cef5fb58433e3f.tar.bz2 | |
Remove ">>>>" markers left over from merge
Diffstat (limited to 'Doc')
| -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. |