forked from openlp/openlp
728ffd7205
You will need to manually delete the __pycache__ directory inside openlp_core_utils. run "bzr resolve openlp_core_utils" then you will be allowed to commit the changes. also resolved conflict for advancedtab.py |
||
---|---|---|
.. | ||
__init__.py | ||
test_aboutform.py | ||
test_advancedtab.py | ||
test_first_time.py | ||
test_firsttimeform.py | ||
test_formattingtagscontroller.py | ||
test_formattingtagsform.py | ||
test_listpreviewwidget.py | ||
test_maindisplay.py | ||
test_mainwindow.py | ||
test_media.py | ||
test_servicemanager.py | ||
test_settingsform.py | ||
test_slidecontroller.py | ||
test_themeform.py | ||
test_thememanager.py |