Kinsey Moore commented on a discussion: https://gitlab.rtems.org/rtems/programs/gsoc/-/merge_requests/75#note_121870 There is still a merge conflict on the shared file. Please rebase on current main branch. -- View it on GitLab: https://gitlab.rtems.org/rtems/programs/gsoc/-/merge_requests/75#note_121870 You're receiving this email because of your account on gitlab.rtems.org.
_______________________________________________ bugs mailing list bugs@rtems.org http://lists.rtems.org/mailman/listinfo/bugs