Console Output

+ git merge --ff appng-manager-1.17.x --strategy-option theirs
Updating 9fded19..2471fb3
Fast-forward
 pom.xml                                                  |  2 +-
 .../application/manager/service/ManagerService.java      |  2 +-
 .../appng/application/manager/business/SubjectsTest.java | 16 ++++++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)