mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-10-03 21:02:09 +00:00
4b19b7448e
The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c |
||
---|---|---|
.. | ||
nitrogen6x |