Console Output

+ git merge --ff appng-authentication-1.14.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 pom.xml                                                          | 2 +-
 .../appng/application/authentication/saml/SamlController.java    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)