diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | 39874e472e540ca1bb923b97b52900e1d60439cc (patch) | |
| tree | e0f47fecb8b5d5e63491c7440d9ecc3072e5cd05 /2.3-1/macros/scilab2c.sci | |
| parent | 3adebb16388c6712f7d9c268b91849d164e696df (diff) | |
| download | Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.tar.gz Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.tar.bz2 Scilab2C-39874e472e540ca1bb923b97b52900e1d60439cc.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to '2.3-1/macros/scilab2c.sci')
| -rw-r--r-- | 2.3-1/macros/scilab2c.sci | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci index aff3df69..70290d09 100644 --- a/2.3-1/macros/scilab2c.sci +++ b/2.3-1/macros/scilab2c.sci @@ -12,10 +12,7 @@ function scilab2c(varargin) [lhs, rhs] = argn(); -<<<<<<< HEAD -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 select rhs // // scilab2c() @@ -201,10 +198,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"), userchoice = 1; end if (userchoice == 1) -<<<<<<< HEAD -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- LAUNCH SCI2C --- runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,Target,Board_name); end |