Fix makefile merge issue

This commit is contained in:
Jenny Curle 2019-04-01 12:25:38 +01:00
commit da9283ebd1