From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 29 Nov 2013 21:40:35 +0000 (+0200)
Subject: Revert unrelated changes introduced by changeset b2066bc8cab9  (issue #19795).
X-Git-Tag: v3.4.0b2~433^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=889d24ee3a6fce69c1059439d49360e364f1b3ef;p=thirdparty%2FPython%2Fcpython.git

Revert unrelated changes introduced by changeset b2066bc8cab9  (issue #19795).
---

diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index e51b315f42d5..efd027b31623 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -918,18 +918,8 @@ an :term:`importer`.
     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::