From fbcffd80979d5411b43b76632b86b180617006ea Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Thu, 12 Sep 2019 16:57:11 -0700
Subject: [PATCH] Fixes unit test and problem in map fuction.
---
src/app/core/submission/submission-rest.service.ts | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index 22594e134d..58aa507314 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -109,14 +109,10 @@ export class SubmissionRestService {
filter((href: string) => isNotEmpty(href)),
distinctUntilChanged(),
map((endpointURL: string) => new SubmissionRequest(requestId, endpointURL)),
-<<<<<<< HEAD
map ((request: RestRequest) => {
request.responseMsToLive = 0;
return request;
}),
-=======
- map ((request: RestRequest) => request.responseMsToLive = 0),
->>>>>>> Setting cache period to zero for all instances where forceBypassCache was previously true.
tap((request: RestRequest) => this.requestService.configure(request)),
flatMap(() => this.fetchRequest(requestId)),
distinctUntilChanged());
--
GitLab