fix merge conflicts

Author: crusaderky

array_api_compat/cupy/_aliases.py

@@ -147,8 +147,6 @@ def take_along_axis(x: Array, indices: Array, /, *, axis: int = -1) -> Array:
                               'bool', 'concat', 'count_nonzero', 'pow', 'sign',
                               'take_along_axis']
 
-def __dir__() -> list[str]:
-    return __all__
 
 def __dir__() -> list[str]:
     return __all__

array_api_compat/dask/array/linalg.py

@@ -4,10 +4,13 @@
 
 import dask.array as da
 
+# The `matmul` and `tensordot` functions are in both the main and linalg namespaces
+from dask.array import matmul, outer, tensordot
+
 # Exports
 from ..._internal import clone_module, get_xp
 from ...common import _linalg
-from ...common._typing import Array as _Array
+from ...common._typing import Array
 
 __all__ = clone_module("dask.array.linalg", globals())
 

array_api_compat/torch/linalg.py

@@ -2,7 +2,6 @@
 
 import torch
 import torch.linalg
-from typing import Optional, Union, Tuple
 
 from .._internal import clone_module