diff options
| author | Chris Johns <chrisj@rtems.org> | 2017-05-31 21:11:01 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2017-05-31 21:11:01 +1000 |
| commit | 32400785ce76eeff3799f091a4dce727b22bbe85 (patch) | |
| tree | b1cddfb42f60e4ab799b81ba0e4f7655b80dd780 /user/tools/symbols.rst | |
| parent | Fixes typos in README.txt (diff) | |
| download | rtems-docs-32400785ce76eeff3799f091a4dce727b22bbe85.tar.bz2 | |
User: Remove the stash conflict markers.
Diffstat (limited to '')
| -rw-r--r-- | user/tools/symbols.rst | 4 |
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 |