aboutsummaryrefslogtreecommitdiff
path: root/node_modules/descriptor.json
diff options
context:
space:
mode:
authorhwc4872012-07-10 09:16:36 -0700
committerhwc4872012-07-10 09:16:36 -0700
commit05542267c8c443a995a2221a2e7976d9894850ba (patch)
tree9eab323c983bdf6fe4a1a22c284c913a74013fa6 /node_modules/descriptor.json
parent7e5c17d1732606b3e32da054e73fe42813cf7326 (diff)
parentf83c329796eae9f11630b0d58d1b21d1ff71655a (diff)
downloadninja-05542267c8c443a995a2221a2e7976d9894850ba.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Diffstat (limited to 'node_modules/descriptor.json')
-rw-r--r--node_modules/descriptor.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index c25354ee..71797bce 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -1,5 +1,4 @@
1{ 1{
2 "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.",
3 "version": "0.0.0.0", 2 "version": "0.0.0.0",
4 "root": "/node_modules/", 3 "root": "/node_modules/",
5 "directories": [ 4 "directories": [