diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | bd03b38be0918837e147e969c6bb2014900009db (patch) | |
| tree | 2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /macros/ASTManagement/_operatio_string.sci | |
| parent | 97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff) | |
| download | scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.gz scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2 scilab2c-bd03b38be0918837e147e969c6bb2014900009db.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'macros/ASTManagement/_operatio_string.sci')
| -rw-r--r-- | macros/ASTManagement/_operatio_string.sci | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/macros/ASTManagement/_operatio_string.sci b/macros/ASTManagement/_operatio_string.sci index 76753868..e9332337 100644 --- a/macros/ASTManagement/_operatio_string.sci +++ b/macros/ASTManagement/_operatio_string.sci @@ -10,8 +10,4 @@ function txt=%operatio_string(O) ' Operator: '+O.operator 'EndOperation' ] -<<<<<<< HEAD endfunction -======= -endfunction ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 |