traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove merge conflict

This commit is contained in:
Neal Norwitz 2008-05-13 04:17:25 +00:00
parent 32ac22a0de
commit 8321f97891
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Doc/library/profile.rst
View File

@ -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: