rtems/rtems-docs
1
0
Fork 0
mirror of https://git.rtems.org/rtems-docs/ synced 2025-05-15 18:46:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

User: Remove conflict marker.

Browse Source
This commit is contained in:
Chris Johns 2017-06-01 11:44:34 +10:00
parent 32400785ce
commit eb934d0d6c
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
user/tools/index.rst
View File

@ -3,7 +3,6 @@
.. comment: Copyright (c) 2017 Chris Johns <chrisj@rtems.org> .. comment: Copyright (c) 2017 Chris Johns <chrisj@rtems.org>
.. comment: All rights reserved. .. comment: All rights reserved.
<<<<<<< Updated upstream
Host Tools Host Tools
********** **********