From dbb884ddef6a7f18b934e06fc63a48fd1d51e837 Mon Sep 17 00:00:00 2001
From: Evelyn Eastmond <evhan55@gmail.com>
Date: Tue, 19 Feb 2019 19:15:09 -0500
Subject: [PATCH] Removing task queue constructor hacks.
---
src/util/task-queue.js | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/util/task-queue.js b/src/util/task-queue.js
index 51f89bdcb..0b452ffb9 100644
--- a/src/util/task-queue.js
+++ b/src/util/task-queue.js
@@ -21,15 +21,8 @@ class TaskQueue {
this._maxTokens = maxTokens;
this._refillRate = refillRate;
this._pendingTaskRecords = [];
-<<<<<<< HEAD
this._tokenCount = options.hasOwnProperty('startingTokens') ? options.startingTokens : maxTokens;
this._maxTotalCost = options.hasOwnProperty('maxTotalCost') ? options.maxTotalCost : Infinity;
-=======
- // this._tokenCount = options.hasOwnProperty('startingTokens') ? options.startingTokens : maxTokens;
- this._tokenCount = options ? maxTokens : maxTokens;
- // this._maxTotalCost = options.hasOwnProperty('maxTotalCost') ? options.maxTotalCost : Infinity;
- this._maxTotalCost = options ? options.maxTotalCost : Infinity;
->>>>>>> Continuing to test the newest TaskQueue with microbit.
this._timer = new Timer();
this._timer.start();
this._timeout = null;