Merge fixes

internet2 · May 11, 2020 · 29b4783 · 29b4783
1 parent 2403bbe
commit 29b4783
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -4554,7 +4554,6 @@ var Events;
     Events["Push"] = "push";
     Events["PullRequest"] = "pull_request";
 })(Events = exports.Events || (exports.Events = {}));
-<<<<<<< HEAD
 var CacheFilename;
 (function (CacheFilename) {
     CacheFilename["Gzip"] = "cache.tgz";
@@ -4569,10 +4568,7 @@ var CompressionMethod;
 // over the socket during this period, the socket is destroyed and the download
 // is aborted.
 exports.SocketTimeout = 5000;
-=======
 exports.RefKey = "GITHUB_REF";
-exports.CacheFilename = "cache.tgz";
->>>>>>> Allow all events to access cache
 
 
 /***/ }),

diff --git a/src/utils/actionUtils.ts b/src/utils/actionUtils.ts
@@ -7,17 +7,13 @@ import * as path from "path";
 import * as util from "util";
 import * as uuidV4 from "uuid/v4";
 
-<<<<<<< HEAD
 import {
     CacheFilename,
     CompressionMethod,
     Outputs,
     RefKey,
     State
 } from "../constants";
-=======
-import { Outputs, RefKey, State } from "../constants";
->>>>>>> Allow all events to access cache
 import { ArtifactCacheEntry } from "../contracts";
 
 // From https://github.com/actions/toolkit/blob/master/packages/tool-cache/src/tool-cache.ts#L23