diff options
Diffstat (limited to 'macros/ASTManagement/_funcall_string.sci')
| -rw-r--r-- | macros/ASTManagement/_funcall_string.sci | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/macros/ASTManagement/_funcall_string.sci b/macros/ASTManagement/_funcall_string.sci index 5218d533..7c0b0abf 100644 --- a/macros/ASTManagement/_funcall_string.sci +++ b/macros/ASTManagement/_funcall_string.sci @@ -7,17 +7,13 @@ function txt=%funcall_string(F) // lhsnb: number, the number of function lhs // Modified By: Ukasha Noor -<<<<<<< HEAD if F.name <> 'disp' -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 txt=['Funcall : '+F.name ' #lhs : '+string(F.lhsnb) ' Rhs : ' ' '+objectlist2string(F.rhs) 'EndFuncall' ] -<<<<<<< HEAD else txt=['Funcall : '+F.name ' #lhs : '+'0' @@ -26,6 +22,4 @@ txt=['Funcall : '+F.name 'EndFuncall' ] end -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction |