summaryrefslogtreecommitdiff
path: root/macros/findDeps/names
diff options
context:
space:
mode:
Diffstat (limited to 'macros/findDeps/names')
-rw-r--r--macros/findDeps/names4
1 files changed, 4 insertions, 0 deletions
diff --git a/macros/findDeps/names b/macros/findDeps/names
index 2b8c551..7b471e9 100644
--- a/macros/findDeps/names
+++ b/macros/findDeps/names
@@ -5,3 +5,7 @@ getAllInterfaces
getAllLibraries
getAllSources
getArduinoFiles
+<<<<<<< HEAD
+=======
+get_rquird_fnctns
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0