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/GeneralFunctions | |
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/GeneralFunctions')
-rw-r--r-- | macros/GeneralFunctions/SCI2CFindFile.sci | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/macros/GeneralFunctions/SCI2CFindFile.sci b/macros/GeneralFunctions/SCI2CFindFile.sci index 77116a1f..f7271e2e 100644 --- a/macros/GeneralFunctions/SCI2CFindFile.sci +++ b/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 = '';
|