From fc19ac2af5d93208afd45bfa818c094bf441135b Mon Sep 17 00:00:00 2001 From: Amjad Masad Date: Wed, 2 Mar 2016 19:13:38 -0800 Subject: [PATCH] Remove merge artificats --- packages/babel-traverse/src/scope/index.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/packages/babel-traverse/src/scope/index.js b/packages/babel-traverse/src/scope/index.js index e4a92a9285..084100c815 100644 --- a/packages/babel-traverse/src/scope/index.js +++ b/packages/babel-traverse/src/scope/index.js @@ -20,25 +20,6 @@ import { scope as scopeCache } from "../cache"; function getCache(node, parentScope, self) { let scopes: Array = scopeCache.get(node) || []; -<<<<<<< HEAD -function matchesParent(scope, parentScope) { - if (scope.parent === parentScope) { - return true; - } -} - -function getCacheMultiple(node, parentScope, self, singleCache) { - let scopes: Array = node[CACHE_MULTIPLE_KEY] = node[CACHE_MULTIPLE_KEY] || []; - - if (singleCache) { - // we have a scope assocation miss so push it onto our scopes - scopes.push(singleCache); - node[CACHE_SINGLE_KEY] = null; - } - - // loop through and check each scope to see if it matches our parent -======= ->>>>>>> Move scope cache to the cache module for (let scope of scopes) { if (scope.parent === parentScope) return scope; }