[rtems-docs commit] User: Remove the stash conflict markers.

[Chris Johns]

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

Author:    Chris Johns <chrisj at rtems.org>
Date:      Wed May 31 21:11:01 2017 +1000

User: Remove the stash conflict markers.

---

 user/tools/symbols.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/user/tools/symbols.rst b/user/tools/symbols.rst
index f4a95ff..91ba077 100644
--- a/user/tools/symbols.rst
+++ b/user/tools/symbols.rst
@@ -132,11 +132,7 @@ Examples
 --------
 
 Create a dynamlically loaded symbol table for the ``minimum.exe`` sample
-<<<<<<< Updated upstream
 program for the ``i386/pc686`` BSP:
-=======
-program for the ``i386/pc686``:
->>>>>>> Stashed changes
 
 .. code-block:: shell