Resolve conflict

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

View File

@ -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