diff options
| author | Eugene Smirnov <evgenii.smirnov@here.com> | 2019-10-23 16:34:49 +0200 |
|---|---|---|
| committer | Eugene Smirnov <evgenii.smirnov@here.com> | 2020-06-30 14:07:27 +0200 |
| commit | 5b75b280f9c1edf0c9c22dc82c0f37017e8bc42f (patch) | |
| tree | 67bc2899f961398304fce2888da10054632e30b6 /recipes-sota | |
| parent | df3d58ab8e6d54f5ae945869efbf4d2cbfdb9612 (diff) | |
| download | meta-updater-5b75b280f9c1edf0c9c22dc82c0f37017e8bc42f.tar.gz | |
Resolve multiple conflicts of NXP layers with usrmerge
Signed-off-by: Eugene Smirnov <evgenii.smirnov@here.com>
Diffstat (limited to 'recipes-sota')
0 files changed, 0 insertions, 0 deletions