Sebastian Huber commented on a discussion: 
https://gitlab.rtems.org/rtems/docs/rtems-docs/-/merge_requests/167#note_129772


Sorry, the updated version doesn't look good. It should not contain changes in 
the generated files. In general, there should be no merge conflict markers in 
the patches.

-- 
View it on GitLab: 
https://gitlab.rtems.org/rtems/docs/rtems-docs/-/merge_requests/167#note_129772
You're receiving this email because of your account on gitlab.rtems.org.


_______________________________________________
bugs mailing list
[email protected]
http://lists.rtems.org/mailman/listinfo/bugs

Reply via email to