Conflicts:
	chart2/AllLangResTarget_chartcontroller.mk

Change-Id: Id9054b3b0c6e7a10a72bc90b05cd7c6bbc5e82a2
Reviewed-on: https://gerrit.libreoffice.org/7205Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>