diff options
Diffstat (limited to '2.3-1/macros/ASTManagement/%operatio_string.sci')
| -rw-r--r-- | 2.3-1/macros/ASTManagement/%operatio_string.sci | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/2.3-1/macros/ASTManagement/%operatio_string.sci b/2.3-1/macros/ASTManagement/%operatio_string.sci index 2a3554dc..cc18e919 100644 --- a/2.3-1/macros/ASTManagement/%operatio_string.sci +++ b/2.3-1/macros/ASTManagement/%operatio_string.sci @@ -4,17 +4,13 @@ function txt=%operatio_string(O) //fields: // operands: a list // operator: a string -<<<<<<< HEAD if O.operator <> 'rc' & O.operator <> 'cc' -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 txt=['Operation' ' Operands:' ' '+objectlist2string(O.operands) ' Operator: '+O.operator 'EndOperation' ] -<<<<<<< HEAD elseif O.operator == 'rc' txt=[' Operands:' ' '+objectlist2string(O.operands) @@ -27,6 +23,3 @@ elseif O.operator == 'cc' ] end endfunction -======= -endfunction ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 |