Conflicts which were fixed: ChangeLog configure.ac doc/man/task-tutorial.5 doc/man/task.1 doc/man/taskrc.5 src/report.cpp
25 KiB
25 KiB
Conflicts which were fixed: ChangeLog configure.ac doc/man/task-tutorial.5 doc/man/task.1 doc/man/taskrc.5 src/report.cpp