diff options
Diffstat (limited to '2.3-1/macros/ASTManagement/_operation_string.sci')
| -rw-r--r-- | 2.3-1/macros/ASTManagement/_operation_string.sci | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/2.3-1/macros/ASTManagement/_operation_string.sci b/2.3-1/macros/ASTManagement/_operation_string.sci index 2de021d9..c9282f67 100644 --- a/2.3-1/macros/ASTManagement/_operation_string.sci +++ b/2.3-1/macros/ASTManagement/_operation_string.sci @@ -10,8 +10,4 @@ function txt=%operation_string(O) ' Operator: '+O.operator 'EndOperation' ] -<<<<<<< HEAD endfunction -======= -endfunction ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 |