Changeset 3240078 in rtems-docs


Ignore:
Timestamp:
May 31, 2017, 11:11:01 AM (2 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
eb934d0
Parents:
737092f
Message:

User: Remove the stash conflict markers.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • user/tools/symbols.rst

    r737092f r3240078  
    133133
    134134Create a dynamlically loaded symbol table for the ``minimum.exe`` sample
    135 <<<<<<< Updated upstream
    136135program for the ``i386/pc686`` BSP:
    137 =======
    138 program for the ``i386/pc686``:
    139 >>>>>>> Stashed changes
    140136
    141137.. code-block:: shell
Note: See TracChangeset for help on using the changeset viewer.