Remove merge conflict

8321f978 · Neal Norwitz · 32ac22a0 · 8321f978
Commit 8321f978 authored May 13, 2008 by Neal Norwitz
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

Doc/library/profile.rst Doc/library/profile.rst +0 -5

No files found.
--- 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: