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