explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2024-12-26 01:46:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflict

Browse Source
This commit is contained in:
Ines Montani 2016-12-07 21:16:52 +01:00
commit ce979553df
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spacy/en/language_data.py
View File

@ -1,6 +1,7 @@
# encoding: utf8
from __future__ import unicode_literals
import re
from ..symbols import *
from ..language_data import EMOTICONS