Fix merge conflict issues

facebook · May 25, 2018 · 3707b89 · 3707b89
1 parent 682612a
commit 3707b89
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
@@ -47,8 +47,6 @@ import requestAnimationFrameForReact from 'shared/requestAnimationFrameForReact'
 // this module is initially evaluated.
 // We want to be using a consistent implementation.
 const localDate = Date;
-const localSetTimeout = setTimeout;
-const localClearTimeout = clearTimeout;
 
 const hasNativePerformanceNow =
   typeof performance === 'object' && typeof performance.now === 'function';
@@ -157,6 +155,7 @@ const messageKey =
   Math.random()
     .toString(36)
     .slice(2);
+const localPostMessage = window.postMessage;
 const idleTick = function(event) {
   if (event.source !== window || event.data !== messageKey) {
     return;