diff options
Diffstat (limited to 'macros/ASTManagement/%equal_string.sci')
| -rw-r--r-- | macros/ASTManagement/%equal_string.sci | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/macros/ASTManagement/%equal_string.sci b/macros/ASTManagement/%equal_string.sci index 29e8cb6b..041fb84a 100644 --- a/macros/ASTManagement/%equal_string.sci +++ b/macros/ASTManagement/%equal_string.sci @@ -13,8 +13,4 @@ function txt=%equal_string(e) ' '+objectlist2string(e.lhs) 'EndEqual' ] -<<<<<<< HEAD endfunction -======= -endfunction ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 |