From 61057d1a256d092434cb0d4c5777cdc5446b6d12 Mon Sep 17 00:00:00 2001 From: buxxi Date: Sat, 13 Mar 2021 22:58:30 +0100 Subject: [PATCH] fix package-lock merge conflict --- package-lock.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8674e96a..15382503 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5840,15 +5840,9 @@ "dev": true }, "simple-git": { -<<<<<<< HEAD "version": "2.36.2", "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.36.2.tgz", "integrity": "sha512-orBEf65GfSiQMsYedbJXSiRNnIRvhbeE5rrxZuEimCpWxDZOav0KLy2IEiPi1YJCF+zaC2quiJF8A4TsxI9/tw==", -======= - "version": "2.36.0", - "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.36.0.tgz", - "integrity": "sha512-EJNaUgGYzBnQiyEkNZgbQSg76agbEDqlgHDr8DAXqV8xWvcefydbipye7YXtHMGbbEK998dcFezS8qF0sepZ5Q==", ->>>>>>> 7515fc10d18b5bf2b04d96f42a704a145e04586f "requires": { "@kwsites/file-exists": "^1.1.1", "@kwsites/promise-deferred": "^1.1.1",