forked from LiveCarta/BookConverter
fix conflicts
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user