Console Output

+ git merge --ff hotfix/appng-1.24.1.1 --strategy-option theirs
Auto-merging pom.xml
Auto-merging appng-xmlapi/pom.xml
Auto-merging appng-upngizr/README.adoc
Auto-merging appng-tools/pom.xml
Auto-merging appng-testsupport/pom.xml
Auto-merging appng-template-parent/pom.xml
Auto-merging appng-template-assembly/pom.xml
Auto-merging appng-taglib/pom.xml
Auto-merging appng-standalone/pom.xml
Auto-merging appng-search/pom.xml
Auto-merging appng-rest-api/pom.xml
Auto-merging appng-persistence/pom.xml
Auto-merging appng-maven-plugin/pom.xml
Auto-merging appng-maven-plugin/README.adoc
Auto-merging appng-mail/pom.xml
Auto-merging appng-formtags/pom.xml
Auto-merging appng-forms/pom.xml
Auto-merging appng-documentation/pom.xml
Auto-merging appng-core/pom.xml
Auto-merging appng-cli/pom.xml
Auto-merging appng-camunda/pom.xml
Auto-merging appng-archetype-application/pom.xml
Auto-merging appng-appngizer/pom.xml
Auto-merging appng-appngizer-maven-plugin/pom.xml
Auto-merging appng-appngizer-jaxb/pom.xml
Auto-merging appng-application/pom.xml
Auto-merging appng-application/README.adoc
Auto-merging appng-application-parent/pom.xml
Auto-merging appng-application-camunda/pom.xml
Auto-merging appng-application-bom/pom.xml
Auto-merging appng-application-assembly/pom.xml
Auto-merging appng-api/src/main/java/org/appng/api/config/RestConfig.java
Auto-merging appng-api/pom.xml
Auto-merging README.adoc
Merge made by the 'recursive' strategy.
 README.adoc                                                  | 6 +++---
 appng-api/pom.xml                                            | 2 +-
 appng-api/src/main/java/org/appng/api/config/RestConfig.java | 3 ++-
 appng-application-assembly/pom.xml                           | 2 +-
 appng-application-bom/pom.xml                                | 4 ++--
 appng-application-camunda/pom.xml                            | 2 +-
 appng-application-parent/pom.xml                             | 4 ++--
 appng-application/README.adoc                                | 4 ++--
 appng-application/pom.xml                                    | 2 +-
 appng-appngizer-jaxb/pom.xml                                 | 2 +-
 appng-appngizer-maven-plugin/pom.xml                         | 4 ++--
 appng-appngizer/pom.xml                                      | 2 +-
 appng-archetype-application/pom.xml                          | 2 +-
 appng-camunda/pom.xml                                        | 2 +-
 appng-cli/pom.xml                                            | 2 +-
 appng-core/pom.xml                                           | 2 +-
 appng-documentation/pom.xml                                  | 2 +-
 appng-forms/pom.xml                                          | 2 +-
 appng-formtags/pom.xml                                       | 2 +-
 appng-mail/pom.xml                                           | 2 +-
 appng-maven-plugin/README.adoc                               | 4 ++--
 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                                | 6 +++---
 appng-testsupport/pom.xml                                    | 2 +-
 appng-tools/pom.xml                                          | 2 +-
 appng-upngizr/README.adoc                                    | 4 ++--
 appng-upngizr/pom.xml                                        | 2 +-
 appng-xmlapi/pom.xml                                         | 2 +-
 pom.xml                                                      | 4 ++--
 35 files changed, 47 insertions(+), 46 deletions(-)