summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-05-31 21:11:01 +1000
committerChris Johns <chrisj@rtems.org>2017-05-31 21:11:01 +1000
commit32400785ce76eeff3799f091a4dce727b22bbe85 (patch)
treeb1cddfb42f60e4ab799b81ba0e4f7655b80dd780
parent737092fb982f8b049e3b30b484c832344d281fa3 (diff)
downloadrtems-docs-32400785ce76eeff3799f091a4dce727b22bbe85.tar.bz2
User: Remove the stash conflict markers.
-rw-r--r--user/tools/symbols.rst4
1 files changed, 0 insertions, 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