Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	spacy/errors.py
#	spacy/lexeme.pyx
#	spacy/matcher/phrasematcher.pyx
#	spacy/ml/models/tok2vec.py
#	spacy/morphology.pxd
#	spacy/morphology.pyx
#	spacy/pipeline/__init__.py
#	spacy/pipeline/_parser_internals/_beam_utils.pyx
#	spacy/pipeline/_parser_internals/ner.pyx
#	spacy/pipeline/_parser_internals/search.pxd
#	spacy/pipeline/edit_tree_lemmatizer.py
#	spacy/pipeline/entity_linker.py
#	spacy/pipeline/morphologizer.pyx
#	spacy/pipeline/senter.pyx
#	spacy/pipeline/spancat.py
#	spacy/pipeline/tagger.pyx
#	spacy/pipeline/textcat_multilabel.py
#	spacy/pipeline/trainable_pipe.pyx
#	spacy/pipeline/transition_parser.pyx
#	spacy/schemas.py
#	spacy/strings.pyi
#	spacy/strings.pyx
#	spacy/tests/doc/test_span.py
#	spacy/tests/doc/test_underscore.py
#	spacy/tests/pipeline/test_edit_tree_lemmatizer.py
#	spacy/tests/pipeline/test_entity_linker.py
#	spacy/tests/pipeline/test_entity_ruler.py
#	spacy/tests/pipeline/test_morphologizer.py
#	spacy/tests/pipeline/test_senter.py
#	spacy/tests/pipeline/test_textcat.py
#	spacy/tests/serialize/test_serialize_pipeline.py
#	spacy/tokenizer.pyx
#	spacy/tokens/graph.pyx
#	spacy/tokens/morphanalysis.pxd
#	spacy/tokens/morphanalysis.pyx
#	spacy/tokens/span.pyi
#	spacy/tokens/span.pyx
#	spacy/tokens/token.pyx
#	spacy/training/batchers.py
#	spacy/training/loop.py
#	website/docs/api/cli.mdx
#	website/docs/api/language.mdx
#	website/docs/api/stringstore.mdx
#	website/docs/usage/rule-based-matching.mdx
  • Loading branch information
jikanter committed Apr 17, 2024
2 parents 117e455 + 1dcc4fd commit 6c0038c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 6c0038c

Please sign in to comment.