diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2008-05-13 04:17:25 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2008-05-13 04:17:25 (GMT) |
| commit | 8321f978918e3ae4de18672770c6504dcae82343 (patch) | |
| tree | 155d2aed5e660b8efc777d8bea0b5680499aa0b6 /Doc | |
| parent | 32ac22a0dec9ece914198bce82180297f03d945f (diff) | |
| download | cpython-8321f978918e3ae4de18672770c6504dcae82343.zip cpython-8321f978918e3ae4de18672770c6504dcae82343.tar.gz cpython-8321f978918e3ae4de18672770c6504dcae82343.tar.bz2 | |
Remove merge conflict
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/profile.rst | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst index f763f2d..1bf1501 100644 --- 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: |