Commits

Anonymous committed 80c9afc

Clean up some stuff that got screwed up in the merge.

Comments (0)

Files changed (1)

sphinx/builders/epub.py

                         os.path.splitext(_coverpage_name)[0], ctx, html_tmpl)
 
         guide = []
-<<<<<<< local
-=======
         auto_add_cover = True
         auto_add_toc = True
->>>>>>> other
         if self.config.epub_guide:
             for type, uri, title in self.config.epub_guide:
-<<<<<<< local
-=======
                 file = uri.split('#')[0]
                 if file not in self.files:
                     self.files.append(file)
                     auto_add_cover = False
                 if type == 'toc':
                     auto_add_toc = False
->>>>>>> other
                 guide.append(_guide_template % {
                         'type': self.esc(type),
                         'title': self.esc(title),
                         'uri': self.esc(uri)
                         })
-<<<<<<< local
 
-=======
         if auto_add_cover and html_tmpl:
             guide.append(_guide_template % {
                     'type': 'cover',
                     'title': _guide_titles['toc'],
                     'uri': self.esc(self.refnodes[0]['refuri'])
                     })
->>>>>>> other
         projectfiles = '\n'.join(projectfiles)
         spine = '\n'.join(spine)
         guide = '\n'.join(guide)