From 77bb85fdcadae76be7eec414c2e85fbbc05a9fa8 Mon Sep 17 00:00:00 2001 From: ankaracekicisi06 Date: Tue, 21 Jun 2022 06:52:34 +0300 Subject: [PATCH] My Project Summery --- package-lock.json | 6 ++++++ package.json | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/package-lock.json b/package-lock.json index 8086560..89ed056 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,15 @@ "requires": true, "dependencies": { "@actions/cache": { +<<<<<<< HEAD "version": "1.0.7", "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-1.0.7.tgz", "integrity": "sha512-MY69kxuubqUFq84pFlu8m6Poxl5sR/xyhpC4JEvno7Yg9ASYdGizEmKgt0m8ovewpYKf15UAOcSC0hzS+DuosA==", +======= + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-1.0.10.tgz", + "integrity": "sha512-8l9A54RXsPHbHs4Tu0DGqTyE5cguvq3xO9H0ohbLa5zbL2Z4dh9lxnjQn2xojsPQr4WnEVgbaVZpc1tlhehQGw==", +>>>>>>> parent of b13b69d (Took toolkit changes.) "requires": { "@actions/core": "^1.2.6", "@actions/exec": "^1.0.1", diff --git a/package.json b/package.json index 5fe21e8..52487ba 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,11 @@ "author": "GitHub", "license": "MIT", "dependencies": { +<<<<<<< HEAD "@actions/cache": "^1.0.7", +======= + "@actions/cache": "^1.0.10", +>>>>>>> parent of b13b69d (Took toolkit changes.) "@actions/core": "^1.2.6", "@actions/exec": "^1.0.1", "@actions/io": "^1.1.0"