Console Output

+ git merge --ff appng-manager-1.16.x --strategy-option theirs
Auto-merging src/main/java/org/appng/application/manager/business/Cache.java
Auto-merging pom.xml
Merge made by the 'recursive' strategy.
 application-home/application.xml                   |  1 +
 pom.xml                                            |  2 +-
 .../appng/application/manager/business/Cache.java  | 95 +++++++++++++---------
 3 files changed, 57 insertions(+), 41 deletions(-)