diff options
Diffstat (limited to 'macros/ASTManagement/_operation_string.sci')
| -rw-r--r-- | macros/ASTManagement/_operation_string.sci | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/macros/ASTManagement/_operation_string.sci b/macros/ASTManagement/_operation_string.sci index 84f5ce3..2de021d 100644 --- a/macros/ASTManagement/_operation_string.sci +++ b/macros/ASTManagement/_operation_string.sci @@ -10,4 +10,8 @@ function txt=%operation_string(O) ' Operator: '+O.operator 'EndOperation' ] -endfunction
\ No newline at end of file +<<<<<<< HEAD +endfunction +======= +endfunction +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 |