From 4e2253170cd769bd46ab3e65cedf85979c5f0ae9 Mon Sep 17 00:00:00 2001
From: Matthew Honnibal <honnibal@gmail.com>
Date: Sat, 16 Jan 2016 18:01:36 +0100
Subject: [PATCH] * Move test for doc.merge to tokens_api file, to avoid name
 conflicts which upset pytest

---
 spacy/tests/tokens/test_merge.py | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 spacy/tests/tokens/test_merge.py

diff --git a/spacy/tests/tokens/test_merge.py b/spacy/tests/tokens/test_merge.py
deleted file mode 100644
index 944a62d0a..000000000
--- a/spacy/tests/tokens/test_merge.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from __future__ import unicode_literals
-from spacy.en import English
-import numpy as np
-from spacy.attrs import HEAD
-
-
-def test_merge_hang():
-    text = 'through North and South Carolina'
-    EN = English(parser=False)
-    doc = EN(text, tag=True)
-    heads = np.asarray([[0, 3, -1, -2, -4]], dtype='int32')
-    doc.from_array([HEAD], heads.T)
-    doc.merge(18, 32, '', '', 'ORG')
-    doc.merge(8, 32, '', '', 'ORG')