This is an automated email from the git hooks/post-receive script. New commit to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.