summaryrefslogtreecommitdiffstats
path: root/user
diff options
context:
space:
mode:
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
**********