This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from d15d38e [jgitflow-maven-plugin]merging 'release/4.0-alpha-5' into 'master' adds 73d35e8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 33941c3 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 1c9d999 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds eb5d1aa Handle duplication on elementary cell (refs #2246) adds b7df710 [jgitflow-maven-plugin]updating poms for 4.0-alpha-6 branch with snapshot versions adds 50565e6 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-6' with non-snapshot versions adds 311cdf9 [jgitflow-maven-plugin]merging 'release/4.0-alpha-6' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../actions/VoyageAcousticsImportAction.java | 61 +++------------------ .../importdata/csv/VoyageAcousticImportRow.java | 19 +++++-- .../strategy/AcousticRemoveDataStrategy.java | 4 +- .../import-data/acoustic/movies_small.csv.gz | Bin 7963 -> 7963 bytes echobase-ui/pom.xml | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 2 +- .../resources/i18n/echobase-ui_fr_FR.properties | 2 +- .../src/main/webapp/WEB-INF/includes/footer.jsp | 2 +- pom.xml | 2 +- 11 files changed, 31 insertions(+), 67 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.