From 32400785ce76eeff3799f091a4dce727b22bbe85 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 31 May 2017 21:11:01 +1000 Subject: User: Remove the stash conflict markers. --- user/tools/symbols.rst | 4 ---- 1 file changed, 4 deletions(-) (limited to 'user') 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 -- cgit v1.2.3