Remove merge conflict

diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
index f763f2d0a63044b0e83d8b3d08feeb8b2d4d8639..1bf15014ea91bb85b9938b66ad38c0b08d4553b6 100644 (file)
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -67,12 +67,7 @@ The :mod:`profile` and :mod:`cProfile` modules export the same interface, so
 they are mostly interchangeable; :mod:`cProfile` has a much lower overhead but
 is newer and might not be available on all systems.
 :mod:`cProfile` is really a compatibility layer on top of the internal
-<<<<<<< .working
 :mod:`_lsprof` module.
-=======
-:mod:`_lsprof` module.  The :mod:`hotshot` module is reserved for specialized
-usage.
->>>>>>> .merge-right.r62379
 
 
 .. _profile-instant: