Console Output

+ git merge --ff appng-scheduler-1.14.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 application-home/application.xml                        |  2 +-
 pom.xml                                                 |  2 +-
 .../scheduler/configuration/SchedulerConfig.java        | 17 ++++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)