Tomas Groth aa5554a696 Fix unresolved conflict.		2019-02-03 21:44:46 +01:00
..
lib
__init__.py
test_filerenamedialog.py
test_init.py
test_mainwindow.py
test_servicemanager.py
test_servicenotedialog.py
test_settings_form.py
test_shortcutlistform.py
test_starttimedialog.py
test_thememanager.py	HEAD	2018-10-01 21:39:42 -07:00