kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-02 22:08:42 +00:00
Code Issues Projects Releases Wiki Activity

fix package-lock merge conflict

Browse Source
This commit is contained in:
buxxi 2021-03-13 22:58:30 +01:00
parent 03964d6f68
commit 61057d1a25
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -5840,15 +5840,9 @@
"dev": true "dev": true
}, },
"simple-git": { "simple-git": {
<<<<<<< HEAD
"version": "2.36.2", "version": "2.36.2",
"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.36.2.tgz", "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.36.2.tgz",
"integrity": "sha512-orBEf65GfSiQMsYedbJXSiRNnIRvhbeE5rrxZuEimCpWxDZOav0KLy2IEiPi1YJCF+zaC2quiJF8A4TsxI9/tw==", "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": { "requires": {
"@kwsites/file-exists": "^1.1.1", "@kwsites/file-exists": "^1.1.1",
"@kwsites/promise-deferred": "^1.1.1", "@kwsites/promise-deferred": "^1.1.1",