From feabe1dc3c50fe10bd3e5e38c4c238cce6f80271 Mon Sep 17 00:00:00 2001
From: Christopher <chris.ramirezg@gmail.com>
Date: Tue, 8 Aug 2017 20:52:07 -0600
Subject: [PATCH] FIx unresolved merge conflic.

---
 secretary.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/secretary.py b/secretary.py
index 41e6bdd..37bf981 100644
--- a/secretary.py
+++ b/secretary.py
@@ -438,11 +438,7 @@ class Renderer(object):
         """
         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>'
->>>>>>> f74046fb09401facbece39056dd53dafe3f814e9
         for m in re.findall(find_pattern, xml_text):
             replacement = m[1].replace('\n', '<text:line-break/>')
             replacement = replacement.replace('\t', '<text:tab/>')