Re: [U-Boot] [PATCH v4 01/29] Remove some merge markers

On Tue, Oct 18, 2016 at 7:42 AM, Simon Glass sjg@chromium.org 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