diff options
| author | John Klug <john.klug@multitech.com> | 2022-07-29 09:41:38 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2022-07-29 09:41:38 -0500 |
| commit | 7ceadd4adfbc52a434d9fbd6fedf7064cd957a36 (patch) | |
| tree | 2b055f187d97eccac77a0fc7a49e1c976244e06d /recipes-bsp | |
| parent | a4bf560211ce33109c3ca7cff0cddb6f9da864e3 (diff) | |
| parent | 46b385955e0177cfbdebac23df7907f53e945d89 (diff) | |
| download | meta-multitech-atmel-7ceadd4adfbc52a434d9fbd6fedf7064cd957a36.tar.gz meta-multitech-atmel-7ceadd4adfbc52a434d9fbd6fedf7064cd957a36.tar.bz2 meta-multitech-atmel-7ceadd4adfbc52a434d9fbd6fedf7064cd957a36.zip | |
Merge branch 'ym/fix_merge_conflict_mtre.conf' into '6'
Fix merge conflict in the mtre.conf file
See merge request !25
Diffstat (limited to 'recipes-bsp')
0 files changed, 0 insertions, 0 deletions