From 3707b89b81fce324ffeb00f88ec0bf1bbade29b7 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@fb.com>
Date: Fri, 25 May 2018 11:44:59 -0700
Subject: [PATCH] Fix merge conflict issues

---
 packages/react-scheduler/src/ReactScheduler.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js
index 51a0792aebc2d..5bf9ff353573b 100644
--- 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;