summaryrefslogtreecommitdiff
path: root/macros/findDeps/names
diff options
context:
space:
mode:
authorBrijeshcr2017-07-08 20:18:17 +0530
committerGitHub2017-07-08 20:18:17 +0530
commitbd03b38be0918837e147e969c6bb2014900009db (patch)
tree2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /macros/findDeps/names
parent97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff)
downloadScilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.gz
Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2
Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.zip
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'macros/findDeps/names')
-rw-r--r--macros/findDeps/names4
1 files changed, 0 insertions, 4 deletions
diff --git a/macros/findDeps/names b/macros/findDeps/names
index 7b471e9..2b8c551 100644
--- a/macros/findDeps/names
+++ b/macros/findDeps/names
@@ -5,7 +5,3 @@ getAllInterfaces
getAllLibraries
getAllSources
getArduinoFiles
-<<<<<<< HEAD
-=======
-get_rquird_fnctns
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0