24 Oct
2016
24 Oct
'16
3:40 a.m.
On Mon, Oct 17, 2016 at 08:12:34PM -0600, Simon Glass wrote:
These two files have patch merge markers in them, within comments or strings. Remove then, so that a search for merge markers does not show up matches in these files.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Jagan Teki jteki@openedev.com
Applied to u-boot/master, thanks!
--
Tom