summaryrefslogtreecommitdiff
path: root/deps/npm/LICENSE
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2014-06-05 15:18:15 -0700
committerTimothy J Fontaine <tjfontaine@gmail.com>2014-06-06 15:07:29 -0700
commitf051f317905b3b31945dfe965a492e54902e595f (patch)
tree06fedaefc3fc2dd5d6f197762afa4cd351659858 /deps/npm/LICENSE
parent535c7777ac674ba86cf93c44824e07b0e23ea8c4 (diff)
downloadnode-new-f051f317905b3b31945dfe965a492e54902e595f.tar.gz
npm: upgrade to v1.4.14
Diffstat (limited to 'deps/npm/LICENSE')
-rw-r--r--deps/npm/LICENSE5
1 files changed, 2 insertions, 3 deletions
diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE
index 2c0baba401..9505fc1199 100644
--- a/deps/npm/LICENSE
+++ b/deps/npm/LICENSE
@@ -214,9 +214,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------
-"Node.js" and "node" trademark Joyent, Inc. npm is not officially
-part of the Node.js project, and is neither owned by nor
-officially affiliated with Joyent, Inc.
+"Node.js" trademark Joyent, Inc. npm is not officially part of the Node.js
+project, and is neither owned by nor affiliated with Joyent, Inc.
Packages published in the npm registry (other than the Software and
its included dependencies) are not part of npm itself, are the sole