From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 13 May 2008 04:17:25 +0000 (+0000)
Subject: Remove merge conflict
X-Git-Tag: v3.0b1~353
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8321f978918e3ae4de18672770c6504dcae82343;p=python

Remove merge conflict
---

diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
index f763f2d0a6..1bf15014ea 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: