RTEMS | bsp: Merge conflicts (ba3f0f91)

[Heinz Junkes (@junkes)]

Heinz Junkes commented: https://gitlab.rtems.org/rtems/rtos/rtems/-/commit/ba3f0f917e274e5b1378c1851ee3425335ca905f#note_130777


Sorry, I got the pull/push merge mixed up and need to straighten it out. Sorry, need to pay more attention.

-- 
View it on GitLab: https://gitlab.rtems.org/rtems/rtos/rtems/-/commit/ba3f0f917e274e5b1378c1851ee3425335ca905f#note_130777
You're receiving this email because of your account on gitlab.rtems.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/bugs/attachments/20250911/fc2501c7/attachment.htm>