summaryrefslogtreecommitdiff
path: root/2.3-1/macros/SymbolTable/names
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/SymbolTable/names')
-rw-r--r--2.3-1/macros/SymbolTable/names3
1 files changed, 0 insertions, 3 deletions
diff --git a/2.3-1/macros/SymbolTable/names b/2.3-1/macros/SymbolTable/names
index 2ce0db05..c2efc843 100644
--- a/2.3-1/macros/SymbolTable/names
+++ b/2.3-1/macros/SymbolTable/names
@@ -6,10 +6,7 @@ ST_GetInArgInfo
ST_GetSymbolInfo
ST_InsForCntVars
ST_InsOutArg
-<<<<<<< HEAD
ST_InsOutArg_Dup
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
ST_Load
ST_MatchSymbol
ST_Save