From a2585333a9cde9860353acffb0a06ac29a8409cf Mon Sep 17 00:00:00 2001 From: Raphael Mitsch Date: Thu, 27 Jul 2023 16:27:59 +0200 Subject: [PATCH] Fix merge errors. --- spacy/kb/kb_in_memory.pyx | 2 +- spacy/pipeline/entity_linker.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spacy/kb/kb_in_memory.pyx b/spacy/kb/kb_in_memory.pyx index 43dcb50ef..af8de91e3 100644 --- a/spacy/kb/kb_in_memory.pyx +++ b/spacy/kb/kb_in_memory.pyx @@ -1,5 +1,5 @@ # cython: infer_types=True, profile=True -from typing import Any, Callable, Dict, Iterable, Union +from typing import Any, Callable, Dict, Iterable, Iterator import srsly diff --git a/spacy/pipeline/entity_linker.py b/spacy/pipeline/entity_linker.py index 8f86260c9..5b773a4ee 100644 --- a/spacy/pipeline/entity_linker.py +++ b/spacy/pipeline/entity_linker.py @@ -2,7 +2,7 @@ import random import warnings from itertools import islice 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 from numpy import dtype