[Python-3000-checkins] r62810 - python/branches/py3k/Doc/using/cmdline.rst

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed May  7 04:16:54 2008
New Revision: 62810

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


Modified:
   python/branches/py3k/Doc/using/cmdline.rst

Modified: python/branches/py3k/Doc/using/cmdline.rst
==============================================================================
--- python/branches/py3k/Doc/using/cmdline.rst	(original)
+++ python/branches/py3k/Doc/using/cmdline.rst	Wed May  7 04:16:54 2008
@@ -212,17 +212,6 @@
    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 @@
 
 .. 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.