From 121e564e12cd72fab5f20ab5d6264e9f3bc84dba Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Wed, 28 Aug 2019 17:05:37 -0700
Subject: [PATCH] Refactored to remove forceBypassCache param from
 requestService and from data service classes.

---
 src/app/core/tasks/pool-task-data.service.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/core/tasks/pool-task-data.service.ts b/src/app/core/tasks/pool-task-data.service.ts
index 62689c4cfc..a04c0b20ea 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -27,8 +27,11 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
    */
   protected linkPath = 'pooltasks';
 
+<<<<<<< HEAD
   protected responseMsToLive = 0;
 
+=======
+>>>>>>> Refactored to remove forceBypassCache param from requestService and from data service classes.
   /**
    * Initialize instance variables
    *
-- 
GitLab