From 338e1fda0effda0b749926c38dec6f19a2dd6b6f Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 3 Oct 2017 09:41:05 -0500 Subject: [PATCH] Unbreak merge artefact --- spacy/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/spacy/__init__.py b/spacy/__init__.py index 25af17361..ba2479106 100644 --- a/spacy/__init__.py +++ b/spacy/__init__.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals from .cli.info import info as cli_info from .glossary import explain -<<<<<<< HEAD from .deprecated import resolve_load_name #from .about import __version__ from .about import __version__