# Conflicts: # .gitmodules # freeink-sdk # platformio.ini # src/activities/reader/EpubReaderActivity.cpp