Fix wrong merge of ChangeLog file
Fix wrong merge of ChangeLog file

ama-axelor/axelor-business-suite,ama-axelor/axelor-business-suite,axelor/axelor-business-suite,axelor/axelor-business-suite,axelor/axelor-business-suite,ama-axelor/axelor-business-suite