Console Output

+ git merge --ff appng-manager-1.18.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 pom.xml                                                        |  4 ++--
 .../java/org/appng/application/manager/business/LdapUsers.java |  1 +
 .../application/manager/business/PlatformPropertiesTest.java   |  2 +-
 .../application/manager/business/webservice/LogViewerTest.java |  1 -
 src/test/resources/xml/LdapUsersTest-testSettings.xml          | 10 +++++++++-
 5 files changed, 13 insertions(+), 5 deletions(-)