diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2010-08-15 19:11:02 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2010-08-15 19:11:02 +0000 |
| commit | 0a0248000491b40e03f29a98055a7546316cc92f (patch) | |
| tree | 48795c8ccbd82a1ffb29ebdfd3482abecaad81a7 /numpy/polynomial/chebyshev.py | |
| parent | cc5d13150ce5e03a3523320eeca26e41086a0074 (diff) | |
| download | numpy-0a0248000491b40e03f29a98055a7546316cc92f.tar.gz | |
FIX: Merge munge.
Diffstat (limited to 'numpy/polynomial/chebyshev.py')
| -rw-r--r-- | numpy/polynomial/chebyshev.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/numpy/polynomial/chebyshev.py b/numpy/polynomial/chebyshev.py index 784caeab9..61d7c7f68 100644 --- a/numpy/polynomial/chebyshev.py +++ b/numpy/polynomial/chebyshev.py @@ -647,13 +647,10 @@ def chebmulx(cs): 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]) |