--- old+++ new@@ -1 +1,3 @@The conflict resolution dialogs/processes in team project is not described.
++I’m moving that to 6.1 because there is no emergency and we need to investigate what the thing is anyway.
Group: 5.8-6.0 - user manual --> 6.1
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
https://github.com/omegat-org/omegat/pull/1266
Diff:
https://github.com/omegat-org/omegat/pull/1266