8000 resolve conflict (#25570) · numpy/numpy@fd4913c · GitHub
[go: up one dir, main page]
Skip to content

Commit fd4913c

Browse files
eliegoudouteliegoudout
committed
resolve conflict (#25570)
1 parent cf10bd2 commit fd4913c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

‎numpy/_core/shape_base.pyi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def atleast_1d(arys: _ArrayLike[_SCT], /) -> NDArray[_SCT]: ...
2020
@overload
2121
def atleast_1d(arys: ArrayLike, /) -> NDArray[Any]: ...
2222
@overload
23-
def atleast_1d(*arys: ArrayLike) -> list[NDArray[Any]]: ...
23+
def atleast_1d(*arys: ArrayLike) -> tuple[NDArray[Any]]: ...
2424

2525
@overload
2626
def atleast_2d(
@@ -31,7 +31,7 @@ def atleast_2d(
3131
@overload
3232
def atleast_2d(arys: ArrayLike, /, fill: str = ...) -> NDArray[Any]: ...
3333
@overload
34-
def atleast_2d(*arys: ArrayLike, fill: str = ...) -> list[NDArray[Any]]: ...
34+
def atleast_2d(*arys: ArrayLike, fill: str = ...) -> tuple[NDArray[Any]]: ...
3535

3636
@overload
3737
def atleast_3d(
@@ -42,7 +42,7 @@ def atleast_3d(
4242
@overload
4343
def atleast_3d(arys: ArrayLike, /, fill: str = ...) -> NDArray[Any]: ...
4444
@overload
45-
def atleast_3d(*arys: ArrayLike, fill: str = ...) -> list[NDArray[Any]]: ...
45+
def atleast_3d(*arys: ArrayLike, fill: str = ...) -> tuple[NDArray[Any]]: ...
4646

4747
@overload
4848
def vstack(

0 commit comments

Comments
 (0)
0