This is an automated email from the git hooks/post-receive script. New change to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git from eaa28b6 ne pas mettre les lignes créées dans le rapport (fixes #6116) new 799b75f ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) new 144713e ajout des lots manquants lors de l'import (refs #6116) new 9989c2e ajout de la conf dans l'ui (fixes #6116) new d348a15 Merge branch 'feature/6116' of gitlab.nuiton.org:codelutin/tutti into feature/6116 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d348a155982a4e859d0a3f38451ac735a708a257 Merge: eaa28b6 9989c2e Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 13 11:09:26 2016 +0100 Merge branch 'feature/6116' of gitlab.nuiton.org:codelutin/tutti into feature/6116 Conflicts: tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties commit 9989c2e8d16d54994e01faf9bfd270c91037641c Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 12 18:24:04 2016 +0100 ajout de la conf dans l'ui (fixes #6116) commit 144713e36face2264d566ba00f7d4e229e1e7943 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 12 17:28:39 2016 +0100 ajout des lots manquants lors de l'import (refs #6116) commit 799b75f9749066eed9d90144212120381dc40eea Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 11 18:11:30 2016 +0100 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.