Rooba
/
spaCy
mirror of https://github.com/explosion/spaCy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unbreak merge artefact

This commit is contained in:
Matthew Honnibal 2017-10-03 09:41:05 -05:00
parent 1289187279
commit 338e1fda0e
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spacy/__init__.py
View File

@ -3,7 +3,6 @@ from __future__ import unicode_literals
from .cli.info import info as cli_info from .cli.info import info as cli_info
from .glossary import explain from .glossary import explain
<<<<<<< HEAD
from .deprecated import resolve_load_name from .deprecated import resolve_load_name
#from .about import __version__ #from .about import __version__
from .about import __version__ from .about import __version__