This is an automated email from the git hooks/post-receive script. New commit to branch feature/april in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 263802851c2f8e2b619d5a893348f7019ef74ecf Merge: 662dccae c5fff77a Author: jcouteau <couteau@codelutin.com> Date: Tue Oct 2 15:19:31 2018 +0200 Merge branch 'feature/april' of gitlab.nuiton.org:chorem/pollen into feature/april .../org/chorem/pollen/services/service/VoteService.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --cc pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index bfb73bcc,0f780f74..ba430ec7 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@@ -22,7 -22,20 +22,21 @@@ package org.chorem.pollen.services.serv */ import org.apache.commons.collections4.CollectionUtils; - import org.chorem.pollen.persistence.entity.*; ++ + import org.chorem.pollen.persistence.entity.Choice; + import org.chorem.pollen.persistence.entity.Poll; + import org.chorem.pollen.persistence.entity.PollType; + import org.chorem.pollen.persistence.entity.PollenPrincipal; + import org.chorem.pollen.persistence.entity.PollenPrincipalTopiaDao; + import org.chorem.pollen.persistence.entity.PollenUser; + import org.chorem.pollen.persistence.entity.Polls; + import org.chorem.pollen.persistence.entity.Vote; + import org.chorem.pollen.persistence.entity.VoteToChoice; + import org.chorem.pollen.persistence.entity.VoteToChoiceTopiaDao; + import org.chorem.pollen.persistence.entity.VoteToChoices; + import org.chorem.pollen.persistence.entity.VoteTopiaDao; + import org.chorem.pollen.persistence.entity.VoterList; + import org.chorem.pollen.persistence.entity.VoterListMember; import org.chorem.pollen.services.bean.ChoiceBean; import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PaginationResultBean; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.