Fix merge errors.

This commit is contained in:
Raphael Mitsch 2023-07-27 16:27:59 +02:00
parent 8aa59c4f65
commit a2585333a9
2 changed files with 2 additions and 2 deletions

View File

@ -1,5 +1,5 @@
# cython: infer_types=True, profile=True # cython: infer_types=True, profile=True
from typing import Any, Callable, Dict, Iterable, Union from typing import Any, Callable, Dict, Iterable, Iterator
import srsly import srsly

View File

@ -2,7 +2,7 @@ import random
import warnings import warnings
from itertools import islice from itertools import islice
from pathlib import Path from pathlib import Path
from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Union, cast from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Sequence, Union, cast
import srsly import srsly
from numpy import dtype from numpy import dtype