From eb934d0d6c80e3c395a6e9974e95cc456a262d62 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Thu, 1 Jun 2017 11:44:34 +1000
Subject: User: Remove conflict marker.

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

(limited to 'user/tools/index.rst')

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
 **********
 
-- 
cgit v1.2.3