[Python-checkins] cpython (3.3): Revert unrelated changes introduced by changeset b2066bc8cab9 (issue #19795).

[serhiy.storchaka]

http://hg.python.org/cpython/rev/9d0dc3d7bf01
changeset:   87641:9d0dc3d7bf01
branch:      3.3
parent:      87634:b2066bc8cab9
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri Nov 29 23:40:35 2013 +0200
summary:
  Revert unrelated changes introduced by changeset b2066bc8cab9  (issue #19795).

files:
  Doc/library/importlib.rst |  10 ----------
  1 files changed, 0 insertions(+), 10 deletions(-)


diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -918,18 +918,8 @@
     Reliance on this decorator is discouraged when it is possible to set
     :attr:`__package__` before importing. By
     setting it beforehand the code for the module is executed with the
-<<<<<<<
     attribute set and thus can be used by global level code during
     initialization.
-=======
-   The ``cpython-32`` string comes from the current magic tag (see
-   :func:`get_tag`; if :attr:`sys.implementation.cache_tag` is not defined then
-   :exc:`NotImplementedError` will be raised).  The returned path will end in
-   ``.pyc`` when ``__debug__`` is ``True`` or ``.pyo`` for an optimized Python
-   (i.e. ``__debug__`` is ``False``).  By passing in ``True`` or ``False`` for
-   *debug_override* you can override the system's value for ``__debug__`` for
-   extension selection.
->>>>>>>
 
    .. note::
 

-- 
Repository URL: http://hg.python.org/cpython