fix(closest.js): remoção da marção dos merge não realizado

DP6 · May 31, 2019 · 0f59b29 · 0f59b29
1 parent 3699ade
commit 0f59b29
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,5 @@
 .DS_Store
 package-lock.json
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> 60857a0af0a8d66b3b33ee32cf24b88330255241
-=======
->>>>>>> 60857a0af0a8d66b3b33ee32cf24b88330255241
 
 # Logs
 logs

diff --git a/build/gtm/main.js b/build/gtm/main.js
@@ -54,19 +54,10 @@
         return parent;
       }
       parent = parent.parentNode;
-    } <<
-    << << < HEAD
+    }
     return undefined;
   }
 
-  ===
-  === =
-  parent = parent.parentNode;
-  }
-  return undefined;
-  } >>>
-  >>> > 60857 a0af0a8d66b3b33ee32cf24b88330255241
-
   function getCookie(key) {
     key = '; ' + key + '=';
     var cookie = '; ' + document.cookie;

diff --git a/core/modules/closest.js b/core/modules/closest.js
@@ -10,14 +10,7 @@ function closest(elm, seletor) {
         }
         parent = parent.parentNode;
     }
-<<<<<<< HEAD
     return undefined;
 }
 
 module.exports = closest;
-=======
-    parent = parent.parentNode;
-  }
-  return undefined;
-}
->>>>>>> 60857a0af0a8d66b3b33ee32cf24b88330255241