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