Benjamin Peterson avatar Benjamin Peterson committed d7e2029

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

Comments (0)

Files changed (1)

Doc/using/cmdline.rst

    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
 
 .. 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.
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.