Console Output

+ git merge --ff appng-manager-1.19.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 application-home/dictionary/manager-messages.properties    |  3 ++-
 changelog.txt                                              | 12 ++++++++++++
 pom.xml                                                    |  2 +-
 .../org/appng/application/manager/business/LdapUsers.java  | 14 ++++++++++----
 .../org/appng/application/manager/business/Sessions.java   |  2 +-
 5 files changed, 26 insertions(+), 7 deletions(-)