This is an automated email from the git hooks/post-receive script. New change to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 01169e7 in case of task merging with SyncInfo, added a warning message adds 4c6ab55 corrections for merge request No new revisions were added by this update. Summary of changes: pom.xml | 3 ++- src/main/java/org/chorem/jtimer/JTimerConfig.java | 11 +++++--- .../java/org/chorem/jtimer/entities/SyncInfo.java | 14 ++++++---- .../java/org/chorem/jtimer/entities/TimerTask.java | 8 ++---- .../chorem/jtimer/entities/TimerTaskHelper.java | 13 ++++++--- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 13 +++++---- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 3 ++- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 31 +++++++++------------- 8 files changed, 51 insertions(+), 45 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.