19 Jul
2020
19 Jul
'20
10:49 p.m.
These can appear when moving between branches that have different tools in the tree. Ignore them.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---
(no changes since v1)
.gitignore | 3 +++ 1 file changed, 3 insertions(+)
Applied to u-boot-dm