This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 533aff9 improve UI new edc785d fix conflit of error The 1 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 edc785dce74a569728cb8d6fe6b55d6e8ed2a1db Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 21 16:55:46 2014 +0200 fix conflit of error Summary of changes: .../src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java | 2 +- pollen-rest-api/src/main/resources/mapping | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.