This is an automated email from the git hooks/post-receive script. New commit to branch feature/72_poll_creation_confirmation in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 49bc888da9c0a1ec5ba2152e7d9113d41da59086 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jun 19 17:29:29 2017 +0200 fix bad merge --- pollen-ui-riot-js/src/main/web/js/Poll.js | 1 + 1 file changed, 1 insertion(+) diff --git a/pollen-ui-riot-js/src/main/web/js/Poll.js b/pollen-ui-riot-js/src/main/web/js/Poll.js index 2f764188..0f5f7c05 100644 --- a/pollen-ui-riot-js/src/main/web/js/Poll.js +++ b/pollen-ui-riot-js/src/main/web/js/Poll.js @@ -391,6 +391,7 @@ class Poll { return service.ignoreReport(this.id, target.id, report.id, this.permission || ""); } return Promise.reject("Init poll after ignore report"); + } loadVoteCountingType() { voteCountingTypeService.getVoteCountingType(this.voteCountingType).then((voteCountingTypeValue) => { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.