mirror of https://github.com/explosion/spaCy.git
Resolve conflict
This commit is contained in:
commit
ce979553df
|
@ -1,6 +1,7 @@
|
||||||
# encoding: utf8
|
# encoding: utf8
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from ..symbols import *
|
from ..symbols import *
|
||||||
from ..language_data import EMOTICONS
|
from ..language_data import EMOTICONS
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue