[Python-3000-checkins] r63199 - python/branches/py3k/Doc/library/profile.rst

[neal.norwitz]

Author: neal.norwitz
Date: Tue May 13 06:17:25 2008
New Revision: 63199

Log:
Remove merge conflict

Modified:
   python/branches/py3k/Doc/library/profile.rst

Modified: python/branches/py3k/Doc/library/profile.rst
==============================================================================
--- python/branches/py3k/Doc/library/profile.rst	(original)
+++ python/branches/py3k/Doc/library/profile.rst	Tue May 13 06:17:25 2008
@@ -67,12 +67,7 @@
 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: