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

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