summaryrefslogtreecommitdiff
path: root/recipes-bsp
diff options
context:
space:
mode:
authorYevhen Mykhno <yevhen.mykhno@globallogic.com>2022-07-29 17:03:45 +0300
committerYevhen Mykhno <yevhen.mykhno@globallogic.com>2022-07-29 17:03:45 +0300
commit46b385955e0177cfbdebac23df7907f53e945d89 (patch)
tree2b055f187d97eccac77a0fc7a49e1c976244e06d /recipes-bsp
parenta4bf560211ce33109c3ca7cff0cddb6f9da864e3 (diff)
downloadmeta-multitech-atmel-46b385955e0177cfbdebac23df7907f53e945d89.tar.gz
meta-multitech-atmel-46b385955e0177cfbdebac23df7907f53e945d89.tar.bz2
meta-multitech-atmel-46b385955e0177cfbdebac23df7907f53e945d89.zip
Fix merge conflict in the mtre.conf file
Diffstat (limited to 'recipes-bsp')
0 files changed, 0 insertions, 0 deletions