FlandreScarle7/Fork-Awesome
1
0
Fork 0
mirror of https://github.com/ForkAwesome/Fork-Awesome.git synced 2025-01-26 07:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Solves bad previous merge

Browse Source
This commit is contained in:
Julien Deswaef 2018-02-22 15:34:02 -05:00
parent a494bb60d4
commit 1fad24bd40
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package-lock.json generated
View File

@ -89,8 +89,6 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
"dev": true
},
<<<<<<< HEAD
=======
"boom": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
@ -136,7 +134,6 @@
"dev": true,
"optional": true
},
>>>>>>> snowdrift
"coa": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz",
@ -152,8 +149,6 @@
"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
"dev": true
},
<<<<<<< HEAD
=======
"combined-stream": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
@ -201,7 +196,6 @@
}
}
},
>>>>>>> snowdrift
"css-select": {
"version": "1.3.0-rc0",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz",
@ -451,8 +445,6 @@
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
},
<<<<<<< HEAD
=======
"getpass": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@ -494,7 +486,6 @@
"har-schema": "2.0.0"
}
},
>>>>>>> snowdrift
"has": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
@ -593,8 +584,6 @@
"esprima": "4.0.0"
}
},
<<<<<<< HEAD
=======
"jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
@ -661,7 +650,6 @@
"clean-css": "3.4.28"
}
},
>>>>>>> snowdrift
"mdn-data": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.0.tgz",
@ -836,8 +824,6 @@
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
"dev": true
},
<<<<<<< HEAD
=======
"sntp": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
@ -855,7 +841,6 @@
"dev": true,
"optional": true
},
>>>>>>> snowdrift
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",