lxbfYeaa/BookConverter
Archived
Template
1
0
Fork 0
forked from LiveCarta/BookConverter
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Kiryl
2021-09-24 13:36:59 +03:00
parent e96fe2d20c 3ba7ea6bf4
commit 55ca366583
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/book_solver.py
View File

@@ -15,8 +15,11 @@ from abc import abstractmethod, ABCMeta
from livecarta_config import LawCartaConfig from livecarta_config import LawCartaConfig
from util.helpers import BookLogger, BookStatusWrapper from util.helpers import BookLogger, BookStatusWrapper
<<<<<<< HEAD:converter/src/book_solver.py
=======
>>>>>>> develop:converter/src/solver.py
class BookSolver: class BookSolver:

4
src/docx_solver.py
View File

@@ -8,7 +8,11 @@ from threading import Event
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from html_docx_preprocessor import HTMLDocxPreprocessor from html_docx_preprocessor import HTMLDocxPreprocessor
from libra_html2json_converter import LibraHTML2JSONConverter from libra_html2json_converter import LibraHTML2JSONConverter
<<<<<<< HEAD
from book_solver import BookSolver from book_solver import BookSolver
=======
from solver import BookSolver
>>>>>>> develop
class DocxBook(BookSolver): class DocxBook(BookSolver):

4
src/epub_solver.py
View File

@@ -1,5 +1,9 @@
from epub_converter import EpubConverter from epub_converter import EpubConverter
<<<<<<< HEAD
from book_solver import BookSolver from book_solver import BookSolver
=======
from solver import BookSolver
>>>>>>> develop
class EpubBook(BookSolver): class EpubBook(BookSolver):