[rtems-docs commit] User: Remove conflict marker.

[Chris Johns]

Module:    rtems-docs
Branch:    master
Commit:    eb934d0d6c80e3c395a6e9974e95cc456a262d62
Changeset: http://git.rtems.org/rtems-docs/commit/?id=eb934d0d6c80e3c395a6e9974e95cc456a262d62

Author:    Chris Johns <chrisj at rtems.org>
Date:      Thu Jun  1 11:44:34 2017 +1000

User: Remove conflict marker.

---

 user/tools/index.rst | 1 -
 1 file changed, 1 deletion(-)

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 at rtems.org>
 .. comment: All rights reserved.
 
-<<<<<<< Updated upstream
 Host Tools
 **********