summaryrefslogtreecommitdiff
path: root/2.3-1/macros/GeneralFunctions
diff options
context:
space:
mode:
authoryash11122017-07-07 22:03:16 +0530
committeryash11122017-07-07 22:03:16 +0530
commit640f9fcf3f64298c7958f4bde5a7e6a7602a690d (patch)
treef2d5c577e9c719190f2ce68c976a9acefd6611c6 /2.3-1/macros/GeneralFunctions
parente9de337a34e123749927039f7011fb30fc96f7c9 (diff)
parent9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 (diff)
downloadScilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.gz
Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.bz2
Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.zip
Scilab2C Arduino Updated
Diffstat (limited to '2.3-1/macros/GeneralFunctions')
-rw-r--r--2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci4
1 files changed, 4 insertions, 0 deletions
diff --git a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci
index f7271e2e..77116a1f 100644
--- a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci
+++ b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci
@@ -20,6 +20,10 @@ function [FlagFound,SCIFileName] = SCI2CFindFile(PathList,FileName)
// --- Check input arguments. ---
// ------------------------------
SCI2CNInArgCheck(argn(2),2,2);
+<<<<<<< HEAD
+=======
+
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
FlagFound = 0;
SCIFileName = '';