summaryrefslogtreecommitdiffstats
path: root/user
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-06-01 11:44:34 +1000
committerChris Johns <chrisj@rtems.org>2017-06-01 11:44:34 +1000
commiteb934d0d6c80e3c395a6e9974e95cc456a262d62 (patch)
tree521a290f88df3c6221f4f2f6c0d46da439bca9eb /user
parent32400785ce76eeff3799f091a4dce727b22bbe85 (diff)
downloadrtems-docs-eb934d0d6c80e3c395a6e9974e95cc456a262d62.tar.bz2
User: Remove conflict marker.
Diffstat (limited to 'user')
-rw-r--r--user/tools/index.rst1
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
**********