From 39874e472e540ca1bb923b97b52900e1d60439cc Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Sat, 8 Jul 2017 20:18:17 +0530
Subject: Revert "SCi2cDeps updated, Windows compatibility resolved"

---
 2.3-1/macros/findDeps/names | 4 ----
 1 file changed, 4 deletions(-)

(limited to '2.3-1/macros/findDeps/names')

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
-- 
cgit