evin/secretary
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

FIx unresolved merge conflic.

Browse source
This commit is contained in:
Christopher 2017-08-08 20:52:07 -06:00
parent a33ba90b7b
commit feabe1dc3c
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
secretary.py
View file

@ -438,11 +438,7 @@ class Renderer(object):
""" """
Replace line feed and/or tabs within text:span entities. Replace line feed and/or tabs within text:span entities.
""" """
<<<<<<< HEAD
find_pattern = r'(?is)<text:([\S]+?)>([^>]*?([\n|\t|\r|\x0b|\x0c])[^<]*?)</text:\1>'
=======
find_pattern = r'(?is)<text:([\S]+?).*?>([^>]*?([\n\t])[^<]*?)</text:\1>' find_pattern = r'(?is)<text:([\S]+?).*?>([^>]*?([\n\t])[^<]*?)</text:\1>'
>>>>>>> f74046fb09401facbece39056dd53dafe3f814e9
for m in re.findall(find_pattern, xml_text): for m in re.findall(find_pattern, xml_text):
replacement = m[1].replace('\n', '<text:line-break/>') replacement = m[1].replace('\n', '<text:line-break/>')
replacement = replacement.replace('\t', '<text:tab/>') replacement = replacement.replace('\t', '<text:tab/>')