From 460094bf092714216273e46c33f2dde8b3a73a25 Mon Sep 17 00:00:00 2001
From: Leif Uwe Vogelsang <loffen@loffenonline.com>
Date: Wed, 26 Apr 2017 18:27:55 +0200
Subject: [PATCH] Update __init__.py

---
 spacy/__init__.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spacy/__init__.py b/spacy/__init__.py
index 19cc61c06..ce68dfc1a 100644
--- a/spacy/__init__.py
+++ b/spacy/__init__.py
@@ -4,8 +4,6 @@ from __future__ import unicode_literals
 from . import util
 from .deprecated import resolve_model_name
 from .cli.info import info
-<<<<<<< HEAD
-
 
 from . import en, de, zh, es, it, hu, fr, pt, nl, sv, fi, bn, he, nb