summaryrefslogtreecommitdiff
path: root/macros/ASTManagement/_operatio_string.sci
diff options
context:
space:
mode:
Diffstat (limited to 'macros/ASTManagement/_operatio_string.sci')
-rw-r--r--macros/ASTManagement/_operatio_string.sci4
1 files changed, 4 insertions, 0 deletions
diff --git a/macros/ASTManagement/_operatio_string.sci b/macros/ASTManagement/_operatio_string.sci
index e933233..7675386 100644
--- a/macros/ASTManagement/_operatio_string.sci
+++ b/macros/ASTManagement/_operatio_string.sci
@@ -10,4 +10,8 @@ function txt=%operatio_string(O)
' Operator: '+O.operator
'EndOperation'
]
+<<<<<<< HEAD
endfunction
+=======
+endfunction
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0