| commit | 49c675ee4152095e1a8782d9791cf7231a337e1e | [log] [tgz] |
|---|---|---|
| author | Simon Glass <sjg@chromium.org> | Mon Oct 17 20:12:34 2016 -0600 |
| committer | Tom Rini <trini@konsulko.com> | Sun Oct 23 18:33:18 2016 -0400 |
| tree | 48a48bcf9369a018d2c8ba90f5cf5ea90f8a6ae2 | |
| parent | 3e3d143669529531499db5c8a2bb1e9aaf294cdd [diff] |
Remove some merge markers 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>