mirror of
https://git.rtems.org/rtems-docs/
synced 2025-10-17 11:02:03 +08:00
User: Remove the stash conflict markers.
This commit is contained in:
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user