Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKat Marchán <kzm@zkat.tech>2018-11-26 21:00:50 +0300
committerKat Marchán <kzm@zkat.tech>2018-12-11 01:55:37 +0300
commitb86e515734faf433dc6c457c36c1de52795aa870 (patch)
treed30ad75c46ff47b1db97c1dc2f6ee707c0ecb0c5 /package.json
parenteab4df9250e9169c694b3f6c287d2932bf5e08fb (diff)
libnpm@1.4.0
Diffstat (limited to 'package.json')
-rw-r--r--package.json16
1 files changed, 16 insertions, 0 deletions
diff --git a/package.json b/package.json
index f44401c57..a11fedea5 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
"json-parse-better-errors": "^1.0.2",
"lazy-property": "~1.0.0",
"libcipm": "^3.0.2",
+ "libnpm": "^1.4.0",
"libnpx": "^10.2.0",
"lock-verify": "^2.0.2",
"lockfile": "^1.0.4",
@@ -260,7 +261,22 @@
"cli-table3",
"node-gyp",
"lock-verify",
+<<<<<<< HEAD
"stringify-package"
+||||||| parent of 18f3fb01d... libnpm@1.4.0
+ "stringify-package",
+ "libnpmaccess",
+ "libnpmorg",
+ "libnpmteam",
+ "libnpmsearch"
+=======
+ "stringify-package",
+ "libnpmaccess",
+ "libnpmorg",
+ "libnpmteam",
+ "libnpmsearch",
+ "libnpm"
+>>>>>>> 18f3fb01d... libnpm@1.4.0
],
"devDependencies": {
"deep-equal": "~1.0.1",