[Numpy-svn] r8639 - trunk/numpy/polynomial

[numpy-svn at scipy.org]

Author: charris
Date: 2010-08-15 14:11:02 -0500 (Sun, 15 Aug 2010)
New Revision: 8639

Modified:
   trunk/numpy/polynomial/chebyshev.py
Log:
FIX: Merge munge.

Modified: trunk/numpy/polynomial/chebyshev.py
===================================================================
--- trunk/numpy/polynomial/chebyshev.py	2010-08-15 19:11:00 UTC (rev 8638)
+++ trunk/numpy/polynomial/chebyshev.py	2010-08-15 19:11:02 UTC (rev 8639)
@@ -647,13 +647,10 @@
     out : ndarray
         Array representing the result of the multiplication.
 
-<<<<<<< HEAD
-=======
     Notes
     -----
     .. versionadded:: 1.5.0
 
->>>>>>> poly
     """
     # cs is a trimmed copy
     [cs] = pu.as_series([cs])