diff options
Diffstat (limited to 'macros/GeneralFunctions/SCI2CFindFile.sci')
| -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 = '';
|