diff options
Diffstat (limited to 'macros/GeneralFunctions')
| -rw-r--r-- | macros/GeneralFunctions/SCI2CFindFile.sci | 3 | ||||
| -rw-r--r-- | macros/GeneralFunctions/lib | bin | 1168 -> 1068 bytes |
2 files changed, 3 insertions, 0 deletions
diff --git a/macros/GeneralFunctions/SCI2CFindFile.sci b/macros/GeneralFunctions/SCI2CFindFile.sci index 912a72a..77116a1 100644 --- a/macros/GeneralFunctions/SCI2CFindFile.sci +++ b/macros/GeneralFunctions/SCI2CFindFile.sci @@ -20,7 +20,10 @@ function [FlagFound,SCIFileName] = SCI2CFindFile(PathList,FileName) // --- Check input arguments. ---
// ------------------------------
SCI2CNInArgCheck(argn(2),2,2);
+<<<<<<< HEAD +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFound = 0;
SCIFileName = '';
diff --git a/macros/GeneralFunctions/lib b/macros/GeneralFunctions/lib Binary files differindex 9d57416..7fe75a2 100644 --- a/macros/GeneralFunctions/lib +++ b/macros/GeneralFunctions/lib |