diff options
author | Chris Johns <chrisj@rtems.org> | 2017-06-01 11:44:34 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2017-06-01 11:44:34 +1000 |
commit | eb934d0d6c80e3c395a6e9974e95cc456a262d62 (patch) | |
tree | 521a290f88df3c6221f4f2f6c0d46da439bca9eb /user/tools/index.rst | |
parent | User: Remove the stash conflict markers. (diff) | |
download | rtems-docs-eb934d0d6c80e3c395a6e9974e95cc456a262d62.tar.bz2 |
User: Remove conflict marker.
Diffstat (limited to '')
-rw-r--r-- | user/tools/index.rst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/user/tools/index.rst b/user/tools/index.rst index feb3d31..3860504 100644 --- a/user/tools/index.rst +++ b/user/tools/index.rst @@ -3,7 +3,6 @@ .. comment: Copyright (c) 2017 Chris Johns <chrisj@rtems.org> .. comment: All rights reserved. -<<<<<<< Updated upstream Host Tools ********** |