Merge confict chunk


Khem Raj
 

Hi Denys

This commit

https://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?id=4c1d26f6282b9959b9ee10aa77b3e05ed56299fb

has a merge anchor thats committed perhaps accidentally.

Thanks
-Khem

Join meta-ti@lists.yoctoproject.org to automatically receive all group messages.