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/GeneralFunctions | |
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/GeneralFunctions')
-rw-r--r-- | 2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci index 77116a1f..f7271e2e 100644 --- a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci +++ b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci @@ -20,10 +20,6 @@ function [FlagFound,SCIFileName] = SCI2CFindFile(PathList,FileName) // --- Check input arguments. ---
// ------------------------------
SCI2CNInArgCheck(argn(2),2,2);
-<<<<<<< HEAD -======= -
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFound = 0;
SCIFileName = '';
|