diff options
| author | Simon Glass <sjg@chromium.org> | 2016-10-17 20:12:34 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-23 18:33:18 -0400 |
| commit | 53302bdc480ac8c36ec4da8bd444c63f7872ba02 (patch) | |
| tree | 48a48bcf9369a018d2c8ba90f5cf5ea90f8a6ae2 /common/bootm.c | |
| parent | b0a928a15d7825c08f3be1a3ec5c4bcd8b465fd8 (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>
Diffstat (limited to 'common/bootm.c')
0 files changed, 0 insertions, 0 deletions