..

Author: ShlomoPorges

src/utils/getSelectable.util.js

@@ -26,12 +26,6 @@ function findAncestors(
         child => child.childComponentId
       );
 
-<<<<<<< HEAD
-      // console.log(components[i].id, components[i].title);
-      // console.log("myChildren", myChilren);
-
-=======
->>>>>>> fb1f985158be18ca3fc94b8978b45292fa8b1d28
       let found = currentCompArr.filter(comp => myChilren.includes(comp));
 
       if (found.length) {
@@ -46,14 +40,6 @@ function findAncestors(
       }
     }
   }
-<<<<<<< HEAD
-  
-  // console.log("newancestors", newAncestors);
-  // console.log("comptocheck", componentsToCheck);
-  // console.log("cumulativeancestors", ancestors);
-
-=======
->>>>>>> fb1f985158be18ca3fc94b8978b45292fa8b1d28
   return findAncestors(components, newAncestors, componentsToCheck, ancestors);
 }