diff options
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]) |