fix conflicts

This commit is contained in:
Kiryl
2021-09-24 13:36:59 +03:00
3 changed files with 11 additions and 0 deletions

View File

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