-
Neil Williams authored
Fix up some artifacts of merge conflicts in the merged branch. Signed-off-by: Neil Williams <neil.williams@linaro.org>
a7b7939d
Fix up some artifacts of merge conflicts in the merged branch.
Signed-off-by: Neil Williams <neil.williams@linaro.org>