3
0
Fork 0
mirror of https://code.forgejo.org/actions/cache.git synced 2025-04-22 11:25:31 +00:00

Merge fixes

This commit is contained in:
Aiqiao Yan 2020-05-11 10:18:19 -04:00
parent 2403bbedac
commit 29b4783cc7
2 changed files with 0 additions and 8 deletions

View file

@ -7,7 +7,6 @@ import * as path from "path";
import * as util from "util";
import * as uuidV4 from "uuid/v4";
<<<<<<< HEAD
import {
CacheFilename,
CompressionMethod,
@ -15,9 +14,6 @@ import {
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