Console Output

+ git merge --ff appng-1.20.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 README.adoc                                                       | 4 ++--
 appng-api/pom.xml                                                 | 2 +-
 appng-application-assembly/pom.xml                                | 2 +-
 appng-application-bom/pom.xml                                     | 2 +-
 appng-application-camunda/pom.xml                                 | 2 +-
 appng-application-parent/pom.xml                                  | 2 +-
 appng-application/pom.xml                                         | 2 +-
 appng-appngizer-jaxb/pom.xml                                      | 2 +-
 appng-appngizer-maven-plugin/pom.xml                              | 2 +-
 appng-appngizer/pom.xml                                           | 2 +-
 appng-archetype-application/pom.xml                               | 2 +-
 appng-archetype-application/readme.txt                            | 2 +-
 .../src/main/resources/archetype-resources/pom.xml                | 2 +-
 appng-camunda/pom.xml                                             | 2 +-
 appng-cli/pom.xml                                                 | 2 +-
 appng-core/pom.xml                                                | 2 +-
 appng-core/src/main/java/org/appng/core/service/LdapService.java  | 3 ++-
 appng-documentation/pom.xml                                       | 2 +-
 appng-documentation/src/main/asciidoc/listing/dependencies.txt    | 8 ++++----
 appng-forms/pom.xml                                               | 2 +-
 appng-formtags/pom.xml                                            | 2 +-
 appng-mail/pom.xml                                                | 2 +-
 appng-maven-plugin/pom.xml                                        | 2 +-
 appng-persistence/pom.xml                                         | 2 +-
 appng-rest-api/pom.xml                                            | 2 +-
 appng-search/pom.xml                                              | 2 +-
 appng-standalone/pom.xml                                          | 2 +-
 appng-taglib/pom.xml                                              | 2 +-
 appng-template-assembly/pom.xml                                   | 2 +-
 appng-template-parent/pom.xml                                     | 4 ++--
 appng-testsupport/pom.xml                                         | 2 +-
 appng-tools/pom.xml                                               | 2 +-
 appng-upngizr/README.adoc                                         | 2 +-
 appng-upngizr/pom.xml                                             | 2 +-
 appng-xmlapi/pom.xml                                              | 2 +-
 pom.xml                                                           | 2 +-
 36 files changed, 42 insertions(+), 41 deletions(-)