Console Output

+ git merge --ff appng-manager-1.16.x --strategy-option theirs
Auto-merging src/main/java/org/appng/application/manager/business/SqlExecutor.java
Auto-merging pom.xml
Merge made by the 'recursive' strategy.
 pom.xml                                            |  2 +-
 .../application/manager/business/SqlExecutor.java  | 34 ++++++++++------------
 2 files changed, 16 insertions(+), 20 deletions(-)