Merge pull request #113 from eos87/master

Removing some garbage left by git
aerkalov · Jan 10, 2017 · 8305648 · 8305648
2 parents 090b9f3 + d1d332a
commit 8305648
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/ebooklib/epub.py b/ebooklib/epub.py
@@ -1063,10 +1063,6 @@ def _create_section(itm, items):
                     a.text = item.title
                 elif isinstance(item, EpubHtml):
                     li = etree.SubElement(ol, 'li')
-<<<<<<< HEAD
-=======
-
->>>>>>> bcc5aea... remove trailing whitespace
                     a = etree.SubElement(li, 'a', {'href': os.path.relpath(item.file_name, nav_dir_name)})
                     a.text = item.title